Enlightenment CVS committal
Author : stffrdhrn
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_border.c e_intl.c e_main.c e_prefix.c e_prefix.h
Log Message:
Few stale memory plugs and cleanups:
* Free the e_app callback for e_border on shutdown
* Free the prefix strings on shutdown
* Make better intl errors
* Worthless function commenting
* Comment for disabled shutdown unroll (Why is it disabled?)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- e_apps.c 15 Feb 2006 03:11:35 -0000 1.123
+++ e_apps.c 21 Feb 2006 15:00:09 -0000 1.124
@@ -678,6 +678,18 @@
_e_apps_change_callbacks = evas_list_append(_e_apps_change_callbacks, cb);
}
+/*
+ * Delete the registered callback which has been registered with the data
+ * given data pointer. This function will return after the first match is
+ * made.
+ *
+ * This will only delete the internal callback function reference. It will
+ * not delete the data. If the data or callback pointers can not be matched
+ * this function does nothing.
+ *
+ * @func pointer to function to be deleted
+ * @data pointer that was initialy registered with the add function
+ */
EAPI void
e_app_change_callback_del(void (*func) (void *data, E_App *a, E_App_Change
ch), void *data)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -3 -r1.479 -r1.480
--- e_border.c 3 Feb 2006 06:13:30 -0000 1.479
+++ e_border.c 21 Feb 2006 15:00:09 -0000 1.480
@@ -192,6 +192,9 @@
handlers = evas_list_remove_list(handlers, handlers);
ecore_event_handler_del(h);
}
+
+ e_app_change_callback_del(_e_border_app_change, NULL);
+
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e_intl.c 16 Feb 2006 21:08:43 -0000 1.74
+++ e_intl.c 21 Feb 2006 15:00:10 -0000 1.75
@@ -209,9 +209,9 @@
alias_locale = _e_intl_locale_alias_get(_e_intl_language);
if (!_e_intl_locale_validate(alias_locale))
{
- fprintf(stderr, "Locale %s is NO GOOD. Please "
- "install this locale or don't "
- "use it!\n", alias_locale);
+ fprintf(stderr, "The locale %s cannot be found on your "
+ "system. Please install this locale or try "
+ "something else.\n", alias_locale);
}
else
{
@@ -224,11 +224,14 @@
if (locale_path == NULL)
{
fprintf(stderr, "Can't find the "
- "translation for your locale(%s). "
+ "translation path for the locale %s. "
"Please make sure your messages "
"path is in order. If this locale "
"is an alias make sure you have your "
- "locale.aliases file in the right place\n",
alias_locale);
+ "locale.aliases file in the right place. Note: "
+ "If your locale is C, POSIX, en_US, en_GB, "
+ "en_US.utf8 etc. this is normal.\n",
+ alias_locale);
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- e_main.c 19 Feb 2006 23:53:35 -0000 1.157
+++ e_main.c 21 Feb 2006 15:00:10 -0000 1.158
@@ -685,7 +685,9 @@
/* Store current selected desktops */
_e_main_desk_save();
-#if 0
+
+ /* FIXME: why? oh why is this disabled? */
+#if 0
/* unroll our stack of shutdown functions with exit code of 0 */
_e_main_shutdown(0);
@@ -701,6 +703,8 @@
ecore_file_shutdown();
ecore_app_restart();
}
+
+ e_prefix_shutdown();
/* just return 0 to keep the compiler quiet */
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_prefix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_prefix.c 10 Jan 2006 04:23:43 -0000 1.10
+++ e_prefix.c 21 Feb 2006 15:00:10 -0000 1.11
@@ -22,12 +22,7 @@
{
char *p;
- E_FREE(_exe_path);
- E_FREE(_prefix_path);
- E_FREE(_prefix_path_locale);
- E_FREE(_prefix_path_bin);
- E_FREE(_prefix_path_data);
- E_FREE(_prefix_path_lib);
+ e_prefix_shutdown();
if (!_e_prefix_try_proc())
{
@@ -102,7 +97,7 @@
}
EAPI void
-e_prefix_fallback(void)
+e_prefix_shutdown(void)
{
E_FREE(_exe_path);
E_FREE(_prefix_path);
@@ -110,6 +105,12 @@
E_FREE(_prefix_path_bin);
E_FREE(_prefix_path_data);
E_FREE(_prefix_path_lib);
+}
+
+EAPI void
+e_prefix_fallback(void)
+{
+ e_prefix_shutdown();
_e_prefix_fallbacks();
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_prefix.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_prefix.h 31 Jul 2005 06:22:31 -0000 1.2
+++ e_prefix.h 21 Feb 2006 15:00:10 -0000 1.3
@@ -8,6 +8,7 @@
#define E_PREFIX_H
EAPI int e_prefix_determine(char *argv0);
+EAPI void e_prefix_shutdown(void);
EAPI void e_prefix_fallback(void);
EAPI const char *e_prefix_get(void);
EAPI const char *e_prefix_locale_get(void);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
