Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_bg.c e_theme.c e_fm_mime.c
Log Message:
Cleanup e_bg & e_theme nicely by removing globs.
Tell compiler about more unused hash params in e_fm_mime.c
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_bg.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_bg.c 14 Oct 2007 18:16:44 -0000 1.33
+++ e_bg.c 16 Oct 2007 11:07:52 -0000 1.34
@@ -47,8 +47,12 @@
Evas_List *l = NULL;
/* Deregister mime handler */
- if (bg_hdl) e_fm2_mime_handler_free(bg_hdl);
-
+ if (bg_hdl)
+ {
+ e_fm2_mime_handler_glob_del(bg_hdl, "*.edj");
+ e_fm2_mime_handler_free(bg_hdl);
+ }
+
/* Deregister files in use */
if (e_config->desktop_default_background)
e_filereg_deregister(e_config->desktop_default_background);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_theme.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_theme.c 15 Oct 2007 19:14:53 -0000 1.31
+++ e_theme.c 16 Oct 2007 11:07:52 -0000 1.32
@@ -103,7 +103,11 @@
EAPI int
e_theme_shutdown(void)
{
- if (theme_hdl) e_fm2_mime_handler_free(theme_hdl);
+ if (theme_hdl)
+ {
+ e_fm2_mime_handler_glob_del(theme_hdl, "*.edj");
+ e_fm2_mime_handler_free(theme_hdl);
+ }
if (mappings)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_fm_mime.c 16 Oct 2007 09:15:30 -0000 1.28
+++ e_fm_mime.c 16 Oct 2007 11:07:52 -0000 1.29
@@ -13,7 +13,7 @@
/* local subsystem functions */
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash
__UNUSED__, const char *key, void *data, void *fdata);
-static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key,
void *data, void *fdata);
+static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const
char *key __UNUSED__, void *data, void *fdata);
static Evas_Hash *icon_map = NULL;
static Evas_Hash *_mime_handlers = NULL;
@@ -155,6 +155,7 @@
e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
{
if (!handler) return;
+
evas_stringshare_del(handler->label);
if (handler->icon_group) evas_stringshare_del(handler->icon_group);
E_FREE(handler);
@@ -362,7 +363,7 @@
Evas_List *l = NULL;
tuple = fdata;
- if (e_util_glob_match(tuple->str, key))
+ if (e_util_glob_match(tuple->str, key))
{
handlers = data;
for (l = handlers; l; l = l->next)
@@ -376,7 +377,7 @@
}
static Evas_Bool
-_e_fm_mime_icon_foreach(Evas_Hash *hash, const char *key, void *data, void
*fdata)
+_e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const char *key
__UNUSED__, void *data, void *fdata)
{
Evas_List **freelist;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
