E CVS: proto englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : proto Dir : e17/proto/e_phys/src/bin Modified Files: test_snow.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/proto/e_phys/src/bin/test_snow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- test_snow.c 17 Sep 2006 22:59:15 - 1.2 +++ test_snow.c 27 Jul 2007 06:24:07 - 1.3 @@ -6,8 +6,7 @@ void init_snow_test(E_Phys_World *world) { - E_Phys_Constraint_Boundary *bound; - E_Phys_Particle *p, *c, *w; + E_Phys_Particle *p; Constraint_Wrap *cw; E_Phys_Vector g; - 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
E CVS: proto englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : proto Dir : e17/proto/e_phys Modified Files: .cvsignore Log Message: ignore++ === RCS file: /cvs/e/e17/proto/e_phys/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 22 Mar 2007 17:04:32 - 1.3 +++ .cvsignore 27 Jul 2007 06:22:40 - 1.4 @@ -4,6 +4,8 @@ autom4te.cache config.log config.status +config.guess +config.sub configure libtool depcomp - 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
E CVS: proto englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : proto Dir : e17/proto/e_phys Modified Files: Makefile.am bootstrap Log Message: Fix typo in _DATA for pkg-config There is no m4 directory here. === RCS file: /cvs/e/e17/proto/e_phys/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 27 Jul 2007 01:59:48 - 1.5 +++ Makefile.am 27 Jul 2007 06:21:52 - 1.6 @@ -4,5 +4,5 @@ config.log config.sub configure depcomp \ install-sh ltmain.sh missing -#pkgconfigdir = $(libdir)/pkgconfig -#pkconfig_DATA = ephys.pc +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = ephys.pc === RCS file: /cvs/e/e17/proto/e_phys/bootstrap,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- bootstrap 19 Feb 2007 09:06:21 - 1.3 +++ bootstrap 27 Jul 2007 06:21:52 - 1.4 @@ -5,7 +5,7 @@ touch README -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 #echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 - 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
E CVS: proto davemds
Enlightenment CVS committal Author : davemds Project : e17 Module : proto Dir : e17/proto/e_phys Modified Files: Makefile.am Log Message: don't know really what this means... but it compile and run well on my machine now :) === RCS file: /cvs/e/e17/proto/e_phys/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 22 Mar 2007 17:01:48 - 1.4 +++ Makefile.am 27 Jul 2007 01:59:48 - 1.5 @@ -4,5 +4,5 @@ config.log config.sub configure depcomp \ install-sh ltmain.sh missing -pkgconfigdir = $(libdir)/pkgconfig -pkconfig_DATA = ephys.pc +#pkgconfigdir = $(libdir)/pkgconfig +#pkconfig_DATA = ephys.pc - 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
E CVS: apps/entrance raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/themes/default Modified Files: default.edc Log Message: fix swallow colors === RCS file: /cvs/e/e17/apps/entrance/data/themes/default/default.edc,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- default.edc 13 Aug 2006 04:18:27 - 1.27 +++ default.edc 26 Jul 2007 22:47:32 - 1.28 @@ -1029,7 +1029,6 @@ offset: -5 -5; to: "sessions"; } - color: 255 255 255 0; } } part { @@ -2002,7 +2001,6 @@ offset: 6 -7; to: "bg"; } - color: 0 0 0 0; } } part { - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_utils.c Log Message: more ref/free work. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- efreet_utils.c 26 Jul 2007 10:20:24 - 1.43 +++ efreet_utils.c 26 Jul 2007 22:04:16 - 1.44 @@ -77,6 +77,7 @@ static void efreet_util_desktops_by_category_remove(Efreet_Desktop *desktop); static void efreet_util_desktop_free(Efreet_Util_Desktop *ud); +static void efreet_event_desktop_change_free(void *data, void *ev); static Ecore_Hash *desktop_by_file_id = NULL; static Ecore_Hash *file_id_by_desktop_path = NULL; @@ -317,8 +318,9 @@ ev = NEW(Efreet_Event_Desktop_Change, 1); ev->current = desktop; +efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_ADD; -ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, NULL, NULL); +ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } return desktop; } @@ -558,7 +560,17 @@ if (!ext || strcmp(ext, ".desktop")) return; desktop = efreet_desktop_get(path); -if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) return; +if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) +{ +if (desktop) efreet_desktop_free(desktop); +return; +} + +if (!ecore_hash_get(file_id_by_desktop_path, desktop->orig_path)) +ecore_hash_set(file_id_by_desktop_path, +(void *)ecore_string_instance(desktop->orig_path), +(void *)ecore_string_instance(file_id)); + ud = ecore_hash_get(desktop_by_file_id, file_id); if (!ud) { @@ -575,8 +587,9 @@ ev = NEW(Efreet_Event_Desktop_Change, 1); ev->current = desktop; +efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_ADD; -ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, NULL, NULL); +ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } } else if (priority < ud->priority) @@ -590,18 +603,22 @@ ev = NEW(Efreet_Event_Desktop_Change, 1); ev->current = desktop; +efreet_desktop_ref(ev->current); ev->previous = ud->desktop; +efreet_desktop_ref(ev->previous); ev->change = EFREET_DESKTOP_CHANGE_UPDATE; +efreet_desktop_free(ud->desktop); ud->desktop = desktop; -ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, NULL, NULL); +ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } else +{ +efreet_desktop_free(ud->desktop); ud->desktop = desktop; +} } -if (!ecore_hash_get(file_id_by_desktop_path, desktop->orig_path)) -ecore_hash_set(file_id_by_desktop_path, -(void *)ecore_string_instance(desktop->orig_path), -(void *)ecore_string_instance(file_id)); +else +efreet_desktop_free(desktop); } static void @@ -622,10 +639,11 @@ ev = NEW(Efreet_Event_Desktop_Change, 1); ev->current = ud->desktop; +efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_REMOVE; -ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, NULL, NULL); +ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); -free(ud); +efreet_util_desktop_free(ud); /* This call will search application dirs and add the file to cache if it * exists. */ @@ -645,23 +663,35 @@ if (!ext || strcmp(ext, ".desktop")) return; desktop = efreet_desktop_get(path); -if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) return; +if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) +{ +if (desktop) efreet_desktop_free(desktop); +return; +} + ud = ecore_hash_get(desktop_by_file_id, file_id); if (ud) { Efreet_Event_Desktop_Change *ev; -if (ud->priority < priority) return; +if (ud->priority < priority) +{ +efreet_desktop_free(desktop); +return; +} efreet_util_desktops_by_category_remove(ud->desktop); efreet_util_desktops_by_category_add(desktop); ev = NEW(Efreet_Event_Desktop_Change, 1); ev->current = desktop; +efreet_desktop_ref(ev->current); ev->previous = ud->desktop; +efreet_desktop_ref(ev->previous); ev->change = EFREET_DESKTOP_CHANGE_UPDATE; -ecor
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_menu.c Log Message: Only need to assign ->desktop when ->directory exists. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- efreet_menu.c 26 Jul 2007 19:14:41 - 1.22 +++ efreet_menu.c 26 Jul 2007 21:43:43 - 1.23 @@ -3596,8 +3596,8 @@ { entry->icon = ecore_string_instance(internal->directory->icon); efreet_desktop_ref(internal->directory); +entry->desktop = internal->directory; } -entry->desktop = internal->directory; entry->entries = ecore_list_new(); ecore_list_free_cb_set(entry->entries, ECORE_FREE_CB(efreet_menu_free)); - 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
E CVS: andreas andreas
Enlightenment CVS committal Author : andreas Project : devs Module : andreas Dir : devs/andreas Modified Files: info.txt Log Message: GPS coordinates === RCS file: /cvs/e/devs/andreas/info.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 --- info.txt25 Mar 2006 06:37:29 - 1.1.1.1 +++ info.txt26 Jul 2007 21:40:24 - 1.2 @@ -5,3 +5,4 @@ E-Mail: [EMAIL PROTECTED] WWW: ? Managing: e16menuedit2 +GeoData: 49.682002 10.878665 - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_menu.c Log Message: More ref/free work. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- efreet_menu.c 26 Jul 2007 11:40:04 - 1.21 +++ efreet_menu.c 26 Jul 2007 19:14:41 - 1.22 @@ -817,6 +817,7 @@ entry->id = ecore_string_instance(id); entry->name = ecore_string_instance(desktop->name); if (desktop->icon) entry->icon = ecore_string_instance(desktop->icon); +efreet_desktop_ref(desktop); entry->desktop = desktop; if (!menu->entries) @@ -2509,6 +2510,7 @@ IF_RELEASE(entry->icon); IF_FREE_LIST(entry->entries); IF_RELEASE(entry->id); +if (entry->desktop) efreet_desktop_free(entry->desktop); FREE(entry); } @@ -3590,7 +3592,11 @@ entry->type = EFREET_MENU_ENTRY_MENU; entry->id = ecore_string_instance(internal->name.internal); entry->name = ecore_string_instance(internal->name.name); -if (internal->directory) entry->icon = ecore_string_instance(internal->directory->icon); +if (internal->directory) +{ +entry->icon = ecore_string_instance(internal->directory->icon); +efreet_desktop_ref(internal->directory); +} entry->desktop = internal->directory; entry->entries = ecore_list_new(); ecore_list_free_cb_set(entry->entries, ECORE_FREE_CB(efreet_menu_free)); @@ -3665,6 +3671,7 @@ entry->id = ecore_string_instance(md->id); entry->name = ecore_string_instance(md->desktop->name); if (md->desktop->icon) entry->icon = ecore_string_instance(md->desktop->icon); +efreet_desktop_ref(md->desktop); entry->desktop = md->desktop; return entry; - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet Modified Files: TODO Log Message: ++ === RCS file: /cvs/e/e17/libs/efreet/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- TODO18 Jun 2007 04:26:50 - 1.15 +++ TODO26 Jul 2007 19:15:48 - 1.16 @@ -15,6 +15,8 @@ - If a theme has several icon types (png, xpm..) prefer the first in the extension list. +- Add some ref/free tracking to check if users aren't abusing the system. + Notes from the Menu Spec test - - We're appending the / to the menu names in the test case. We should - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: More desktop ref/free. === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.598 retrieving revision 1.599 diff -u -3 -r1.598 -r1.599 --- e_border.c 26 Jul 2007 12:37:52 - 1.598 +++ e_border.c 26 Jul 2007 12:38:18 - 1.599 @@ -6520,12 +6520,17 @@ bd->icon_object = NULL; } if (!bd->desktop) - bd->desktop = efreet_util_desktop_wm_class_find(bd->client.icccm.name, - bd->client.icccm.class); + { +bd->desktop = efreet_util_desktop_wm_class_find(bd->client.icccm.name, + bd->client.icccm.class); +if (bd->desktop) efreet_desktop_ref(bd->desktop); + } if (!bd->desktop) - bd->desktop = e_exec_startup_id_pid_find(bd->client.netwm.startup_id, - bd->client.netwm.pid); - if (bd->desktop) efreet_desktop_ref(bd->desktop); + { +bd->desktop = e_exec_startup_id_pid_find(bd->client.netwm.startup_id, + bd->client.netwm.pid); +if (bd->desktop) efreet_desktop_ref(bd->desktop); + } bd->icon_object = e_border_icon_add(bd, bd->bg_evas); if ((bd->focused) && (bd->icon_object)) edje_object_signal_emit(bd->icon_object, "e,state,focused", "e"); - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c e_exec.c Log Message: More desktop ref/free. === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.597 retrieving revision 1.598 diff -u -3 -r1.597 -r1.598 --- e_border.c 20 Jul 2007 08:27:59 - 1.597 +++ e_border.c 26 Jul 2007 12:37:52 - 1.598 @@ -4358,6 +4358,7 @@ bd = l->data; if (bd->desktop == event->current) { + efreet_desktop_free(bd->desktop); bd->desktop = NULL; bd->changes.icon = 1; bd->changed = 1; @@ -4374,6 +4375,8 @@ if (bd->desktop == event->previous) { + efreet_desktop_free(bd->desktop); + efreet_desktop_ref(event->current); bd->desktop = event->current; bd->changes.icon = 1; bd->changed = 1; @@ -6522,6 +6525,7 @@ if (!bd->desktop) bd->desktop = e_exec_startup_id_pid_find(bd->client.netwm.startup_id, bd->client.netwm.pid); + if (bd->desktop) efreet_desktop_ref(bd->desktop); bd->icon_object = e_border_icon_add(bd, bd->bg_evas); if ((bd->focused) && (bd->icon_object)) edje_object_signal_emit(bd->icon_object, "e,state,focused", "e"); === RCS file: /cvs/e/e17/apps/e/src/bin/e_exec.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_exec.c4 May 2007 15:55:46 - 1.6 +++ e_exec.c26 Jul 2007 12:37:52 - 1.7 @@ -240,6 +240,7 @@ { Evas_List *l; + efreet_desktop_ref(desktop); inst->desktop = desktop; inst->exe = exe; inst->startup_id = startup_id; @@ -340,6 +341,7 @@ } e_exec_start_pending = evas_list_remove(e_exec_start_pending, inst->desktop); if (inst->expire_timer) ecore_timer_del(inst->expire_timer); + if (inst->desktop) efreet_desktop_free(inst->desktop); free(inst); return 1; } - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_main.c e_order.c Log Message: ref and free desktops for .order files. === RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.225 retrieving revision 1.226 diff -u -3 -r1.225 -r1.226 --- e_main.c24 Jul 2007 18:47:24 - 1.225 +++ e_main.c26 Jul 2007 12:29:52 - 1.226 @@ -903,11 +903,6 @@ /* if we were flagged to restart, then restart. */ if (restart) { - /* selected shutdown */ -#if 0 - e_ipc_shutdown(); - ecore_file_shutdown(); -#endif e_util_env_set("E_RESTART_OK", "1"); ecore_app_restart(); } === RCS file: /cvs/e/e17/apps/e/src/bin/e_order.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_order.c 26 Jul 2007 11:34:09 - 1.26 +++ e_order.c 26 Jul 2007 12:29:52 - 1.27 @@ -68,10 +68,15 @@ EAPI void e_order_remove(E_Order *eo, Efreet_Desktop *desktop) { + Evas_List *tmp; + E_OBJECT_CHECK(eo); E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE); - eo->desktops = evas_list_remove(eo->desktops, desktop); + tmp = evas_list_find_list(eo->desktops, desktop); + if (!tmp) return; + efreet_desktop_free(tmp->data); + eo->desktops = evas_list_remove_list(eo->desktops, tmp); _e_order_save(eo); } @@ -81,6 +86,7 @@ E_OBJECT_CHECK(eo); E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE); + efreet_desktop_ref(desktop); eo->desktops = evas_list_append(eo->desktops, desktop); _e_order_save(eo); } @@ -91,6 +97,7 @@ E_OBJECT_CHECK(eo); E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE); + efreet_desktop_ref(desktop); eo->desktops = evas_list_prepend_relative(eo->desktops, desktop, before); _e_order_save(eo); } @@ -144,7 +151,10 @@ E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE); while (eo->desktops) - eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops); + { + efreet_desktop_free(eo->desktops->data); + eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops); + } _e_order_save(eo); } @@ -152,7 +162,11 @@ static void _e_order_free(E_Order *eo) { - evas_list_free(eo->desktops); + while (eo->desktops) + { + efreet_desktop_free(eo->desktops->data); + eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops); + } if (eo->path) evas_stringshare_del(eo->path); if (eo->monitor) ecore_file_monitor_del(eo->monitor); orders = evas_list_remove(orders, eo); @@ -177,7 +191,11 @@ FILE *f; char *dir; - eo->desktops = evas_list_free(eo->desktops); + while (eo->desktops) + { + efreet_desktop_free(eo->desktops->data); + eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops); + } if (!eo->path) return; dir = ecore_file_dir_get(eo->path); @@ -208,7 +226,11 @@ if (!desktop) desktop = efreet_desktop_get(ecore_file_file_get(buf)); if (!desktop) -desktop = efreet_util_desktop_file_id_find(ecore_file_file_get(buf)); +{ + desktop = efreet_util_desktop_file_id_find(ecore_file_file_get(buf)); + /* Need to ref this as we only get a cache pointer from efreet_util */ + if (desktop) efreet_desktop_ref(desktop); +} if (desktop) eo->desktops = evas_list_append(eo->desktops, desktop); } } @@ -283,6 +305,7 @@ { if (l2->data == event->current) { + efreet_desktop_free(l2->data); eo->desktops = evas_list_remove_list(eo->desktops, l2); changed = 1; } @@ -303,6 +326,8 @@ { if (l2->data == event->previous) { + efreet_desktop_free(l2->data); + efreet_desktop_ref(event->current); l2->data = event->current; changed = 1; } - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Only free data when needed. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.220 retrieving revision 1.221 diff -u -3 -r1.220 -r1.221 --- e_int_menus.c 26 Jul 2007 11:34:08 - 1.220 +++ e_int_menus.c 26 Jul 2007 12:02:22 - 1.221 @@ -545,12 +545,16 @@ if (entry->icon) { - char *file; + if (entry->icon[0] == '/') + e_menu_item_icon_file_set(mi, entry->icon); + else + { + char *file; - if (entry->icon[0] == '/') file = entry->icon; - else file = efreet_icon_path_find(e_config->icon_theme, entry->icon, "24x24"); - e_menu_item_icon_file_set(mi, file); - E_FREE(file); + file = efreet_icon_path_find(e_config->icon_theme, entry->icon, "24x24"); + e_menu_item_icon_file_set(mi, file); + E_FREE(file); + } } if (entry->type == EFREET_MENU_ENTRY_SEPARATOR) e_menu_item_separator_set(mi, 1); - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_modules.c Log Message: Remove const qualifier. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- e_int_config_modules.c 26 Jul 2007 11:34:08 - 1.58 +++ e_int_config_modules.c 26 Jul 2007 12:01:54 - 1.59 @@ -254,7 +254,7 @@ Efreet_Desktop *desk = NULL; Evas_Object *oc = NULL; char buf[4096]; - const char *icon; + char *icon; mod = l->data; if (!mod) continue; @@ -307,7 +307,7 @@ Efreet_Desktop *desk = NULL; Evas_Object *oc = NULL; char buf[4096]; - const char *icon; + char *icon; mod = l->data; if (!mod) continue; - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_menu.c Log Message: efreet_desktop_free after efreet_desktop_get === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- efreet_menu.c 26 Jul 2007 10:20:24 - 1.20 +++ efreet_menu.c 26 Jul 2007 11:40:04 - 1.21 @@ -1895,7 +1895,10 @@ legacy_internal->directory = efreet_desktop_get(file_path); if (legacy_internal->directory && legacy_internal->directory->type != EFREET_DESKTOP_TYPE_DIRECTORY) +{ +efreet_desktop_free(legacy_internal->directory); legacy_internal->directory = NULL; +} continue; } @@ -1910,6 +1913,7 @@ if (efreet_desktop_category_count_get(desktop) != 0) continue; +/* XXX: This will disappear when the .desktop is free'd */ efreet_desktop_category_add(desktop, "Legacy"); if (prefix) @@ -1920,7 +1924,8 @@ else ecore_list_append(filter->op->filenames, strdup(file->d_name)); -count ++; +count++; +efreet_desktop_free(desktop); } closedir(files); @@ -3384,7 +3389,11 @@ if (!ext || strcmp(ext, ".desktop")) continue; desktop = efreet_desktop_get(buf); -if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) continue; +if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_APPLICATION) +{ +if (desktop) efreet_desktop_free(desktop); +continue; +} /* Don't add two files with the same id in the app pool */ if (ecore_list_find(internal->app_pool, ECORE_COMPARE_CB(efreet_menu_cb_md_compare_ids), buf2)) continue; @@ -3479,7 +3488,11 @@ if (!ext || strcmp(ext, ".directory")) continue; desktop = efreet_desktop_get(buf); -if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_DIRECTORY) continue; +if (!desktop || desktop->type != EFREET_DESKTOP_TYPE_DIRECTORY) +{ +efreet_desktop_free(desktop); +continue; +} ecore_hash_set(cache, (void *)strdup(buf2), desktop); } - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_desktop.c Log Message: Return NULL if file does not exist. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- efreet_desktop.c25 Jul 2007 17:00:56 - 1.23 +++ efreet_desktop.c26 Jul 2007 11:37:23 - 1.24 @@ -266,6 +266,8 @@ { Efreet_Desktop *desktop; +if (!ecore_file_exists(file)) return NULL; + desktop = NEW(Efreet_Desktop, 1); if (!desktop) return NULL; - 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
E CVS: libs/ewl englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_icon_theme.c Log Message: Update for changes in efreet. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_icon_theme.c25 Jul 2007 17:01:00 - 1.23 +++ ewl_icon_theme.c26 Jul 2007 11:34:09 - 1.24 @@ -28,11 +28,14 @@ { ewl_icon_theme_cache = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(ewl_icon_theme_cache, ewl_icon_theme_cb_free); + ecore_hash_free_value_cb_set(ewl_icon_theme_cache, free); ewl_icon_fallback_theme_cache = ecore_hash_new( ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(ewl_icon_fallback_theme_cache, ewl_icon_theme_cb_free); + ecore_hash_free_value_cb_set(ewl_icon_fallback_theme_cache, + free); } DRETURN_INT(TRUE, DLEVEL_STABLE); @@ -79,7 +82,7 @@ ewl_icon_theme_cache = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(ewl_icon_theme_cache, ewl_icon_theme_cb_free); - ecore_hash_free_value_cb_set(ewl_icon_theme_cache, ewl_icon_theme_cb_free); + ecore_hash_free_value_cb_set(ewl_icon_theme_cache, free); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -137,7 +140,7 @@ const char *theme, const char *key, Ecore_Hash *cache) { - const char *ret; + char *ret; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("icon", icon, EWL_THEME_KEY_NOMATCH); @@ -145,10 +148,10 @@ ret = ecore_hash_get(cache, key); if (!ret) { + /* XXX: How to store NOMATCH in the cache? The cache is strings which must be free'd */ ret = efreet_icon_path_find(theme, icon, size); if (!ret) ret = EWL_THEME_KEY_NOMATCH; - - ecore_hash_set(cache, strdup(key), (void *)ret); + else ecore_hash_set(cache, strdup(key), (void *)ret); } DRETURN_PTR(ret, DLEVEL_STABLE);; - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_modules.c e_int_menus.c e_module.c e_order.c e_utils.c Log Message: Update for changes in efreet. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- e_int_config_modules.c 25 Jul 2007 17:00:50 - 1.57 +++ e_int_config_modules.c 26 Jul 2007 11:34:08 - 1.58 @@ -11,7 +11,7 @@ static int _sort_modules(void *data1, void *data2); static void _fill_all(E_Config_Dialog_Data *cfdata); static void _fill_loaded(E_Config_Dialog_Data *cfdata); -static const char *_get_icon(Efreet_Desktop *desk); +static char *_get_icon(Efreet_Desktop *desk); static E_Module *_get_module(E_Config_Dialog_Data *cfdata, const char *lbl); /* Callbacks */ @@ -264,8 +264,13 @@ desk = efreet_desktop_get(buf); if (!desk) continue; icon = _get_icon(desk); - if (icon) oc = e_util_icon_add(icon, evas); + if (icon) + { +oc = e_util_icon_add(icon, evas); +free(icon); + } e_widget_ilist_append(cfdata->o_all, oc, desk->name, NULL, NULL, NULL); + efreet_desktop_free(desk); } /* Unfreeze ilist */ @@ -312,8 +317,13 @@ desk = efreet_desktop_get(buf); if (!desk) continue; icon = _get_icon(desk); - if (icon) oc = e_util_icon_add(icon, evas); + if (icon) + { +oc = e_util_icon_add(icon, evas); +free(icon); + } e_widget_ilist_append(cfdata->o_loaded, oc, desk->name, NULL, NULL, NULL); + efreet_desktop_free(desk); } /* Unfreeze ilist */ @@ -329,10 +339,10 @@ e_widget_disabled_set(cfdata->b_configure, 1); } -static const char * +static char * _get_icon(Efreet_Desktop *desk) { - const char *icon; + char *icon; if (!desk) return NULL; if (desk->icon) @@ -345,7 +355,7 @@ path = ecore_file_dir_get(desk->orig_path); snprintf(buf, sizeof(buf), "%s/%s.edj", path, desk->icon); -icon = buf; +icon = strdup(buf); free(path); } return icon; @@ -373,7 +383,12 @@ if (!ecore_file_exists(buf)) continue; desk = efreet_desktop_get(buf); if (!desk) continue; - if (!strcmp(desk->name, lbl)) break; + if (!strcmp(desk->name, lbl)) + { +efreet_desktop_free(desk); +break; + } + efreet_desktop_free(desk); } return mod; } === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.219 retrieving revision 1.220 diff -u -3 -r1.219 -r1.220 --- e_int_menus.c 25 Jul 2007 17:00:50 - 1.219 +++ e_int_menus.c 26 Jul 2007 11:34:08 - 1.220 @@ -545,11 +545,12 @@ if (entry->icon) { - const char *file; + char *file; if (entry->icon[0] == '/') file = entry->icon; else file = efreet_icon_path_find(e_config->icon_theme, entry->icon, "24x24"); e_menu_item_icon_file_set(mi, file); + E_FREE(file); } if (entry->type == EFREET_MENU_ENTRY_SEPARATOR) e_menu_item_separator_set(mi, 1); === RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -3 -r1.80 -r1.81 --- e_module.c 25 Jul 2007 17:00:50 - 1.80 +++ e_module.c 26 Jul 2007 11:34:08 - 1.81 @@ -373,7 +373,7 @@ E_Dialog *dia; E_Border *bd; char buf[PATH_MAX]; - const char *icon = NULL; + char *icon = NULL; dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_module_dialog"); if (!dia) return; @@ -393,13 +393,14 @@ { snprintf(buf, sizeof(buf), "%s/%s.edj", e_module_dir_get(m), desktop->icon); - icon = buf; + icon = strdup(buf); } dia->icon_object = e_util_icon_add(icon, e_win_evas_get(dia->win)); edje_extern_object_min_size_set(dia->icon_object, 64, 64); edje_object_part_swallow(dia->bg_object, "e.swallow.icon", dia->icon_object); evas_object_show(dia->icon_object); } + if (desktop) efreet_desktop_free(desktop); } else e_dialog_icon_set(dia, "enlightenment/modules", 64); @@ -413,6 +414,7 @@ bd = dia->win->border; if (!bd) return; bd->internal_icon = evas_stringshare_add(icon); + free(icon); } /* local subsystem functi
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_icon_theme Modified Files: e_int_config_icon_themes.c Log Message: Update for changes in efreet. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_icon_themes.c 25 Jul 2007 17:00:50 - 1.3 +++ e_int_config_icon_themes.c 26 Jul 2007 11:34:09 - 1.4 @@ -179,7 +179,7 @@ theme = l->data; if (theme->example_icon) { -const char *path; +char *path; path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); if (path) @@ -187,6 +187,7 @@ oc = e_icon_add(evas); e_icon_file_set(oc, path); e_icon_fill_inside_set(oc, 1); + free(path); } } e_widget_ilist_append(ilist, oc, theme->name.name, NULL, NULL, theme->name.internal); @@ -291,7 +292,7 @@ theme = l->data; if (theme->example_icon) { -const char *path; +char *path; path = efreet_icon_path_find(theme->name.internal, theme->example_icon, "24x24"); if (path) @@ -299,6 +300,7 @@ oc = e_icon_add(evas); e_icon_file_set(oc, path); e_icon_fill_inside_set(oc, 1); + free(path); } } e_widget_ilist_append(ilist, oc, theme->name.name, NULL, NULL, theme->name.internal); - 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
E CVS: proto englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : proto Dir : e17/proto/e_dbus/src/bin Modified Files: hal.c Log Message: Update for changes in efreet. === RCS file: /cvs/e/e17/proto/e_dbus/src/bin/hal.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- hal.c 25 Jul 2007 17:01:01 - 1.11 +++ hal.c 26 Jul 2007 11:34:09 - 1.12 @@ -623,7 +623,10 @@ path = efreet_icon_path_find("Tango", icon_name, "32x32"); //printf("found: %s\n", path); if (path) +{ ewl_icon_image_set(icon, path, NULL); + free(path); +} } ewl_callback_append(EWL_WIDGET(icon), EWL_CALLBACK_CLICKED, cb_device_view_clicked, dev); - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_icon_theme.c Log Message: Remove the icon cache. This means that users of efreet_icon_list_find, efreet_icon_path_find and efreet_icon_find must clean up after themselves! === RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ef_icon_theme.c 25 Jul 2007 17:00:56 - 1.5 +++ ef_icon_theme.c 26 Jul 2007 11:30:10 - 1.6 @@ -9,7 +9,7 @@ #define PATH_MAX 4096 #endif -#define SIZE "16x16" +#define SIZE "128x128" #define THEME "Tango" static void ef_icon_theme_themes_find(const char *search_dir, @@ -450,8 +450,7 @@ for (i = 0; icons[i] != NULL; i++) { -const char *path; -char *t, *s; +char *path, *s; path = efreet_icon_path_find(THEME, icons[i], SIZE); @@ -465,10 +464,9 @@ continue; } -t = strdup(path); -s = strrchr(t, '.'); +s = strrchr(path, '.'); if (s) *s = '\0'; -s = strrchr(t, '/'); +s = strrchr(path, '/'); if (s) s++; if (s && strcmp(s, icons[i])) @@ -476,7 +474,7 @@ printf("Name mismatch name (%s) vs ef (%s)\n", icons[i], s); ret = 0; } -free(t); +free(path); } ecore_hash_destroy(icon_hash); - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin/compare Modified Files: efreet_alloc.c Log Message: Remove the icon cache. This means that users of efreet_icon_list_find, efreet_icon_path_find and efreet_icon_find must clean up after themselves! === RCS file: /cvs/e/e17/libs/efreet/src/bin/compare/efreet_alloc.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- efreet_alloc.c 3 Feb 2007 13:05:30 - 1.1 +++ efreet_alloc.c 26 Jul 2007 11:30:10 - 1.2 @@ -1,12 +1,13 @@ #include #include +#include #include "comp.h" int main(int argc, char **argv) { int i = 0, k; -const char *path; +char *path; efreet_init(); @@ -16,6 +17,7 @@ { path = efreet_icon_path_find(THEME, icons[i], SIZE); //printf("%s: %s\n", icons[i], (path ? path : "NOT FOUND")); +if (path) free(path); } } - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: Efreet_Mime.h efreet_icon.c efreet_icon.h efreet_mime.c Log Message: Remove the icon cache. This means that users of efreet_icon_list_find, efreet_icon_path_find and efreet_icon_find must clean up after themselves! === RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet_Mime.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Efreet_Mime.h 17 Jul 2007 19:21:20 - 1.5 +++ Efreet_Mime.h 26 Jul 2007 11:30:10 - 1.6 @@ -35,7 +35,7 @@ const char *efreet_mime_special_type_get(const char *file); const char *efreet_mime_fallback_type_get(const char *file); -const char *efreet_mime_type_icon_get(const char *mime, const char *theme, +char *efreet_mime_type_icon_get(const char *mime, const char *theme, const char *size); /** === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- efreet_icon.c 25 Jul 2007 17:00:56 - 1.25 +++ efreet_icon.c 26 Jul 2007 11:30:10 - 1.26 @@ -2,12 +2,10 @@ #include "Efreet.h" #include "efreet_private.h" -#define NO_MATCH_KEY ((char *)0xdeadbeef) - static char *efreet_icon_deprecated_user_dir = NULL; static char *efreet_icon_user_dir = NULL; static Ecore_Hash *efreet_icon_dirs_cached = NULL; -static Ecore_Hash *efreet_icon_themes = NULL; +static Ecore_Hash *efreet_icon_themes = NULL; Ecore_List *efreet_icon_extensions = NULL; static Ecore_List *efreet_extra_icon_dirs = NULL; @@ -17,52 +15,36 @@ static Efreet_Icon_Theme *efreet_icon_find_theme_check(const char *theme_name); -static Efreet_Icon *efreet_icon_find_fallback(Efreet_Icon_Theme *theme, - const char *cache_key, - const char *icon, - const char *size); -static Efreet_Icon *efreet_icon_list_find_fallback(Efreet_Icon_Theme *theme, -Ecore_List *cache_keys, -Ecore_List *icons, -const char *size); -static Efreet_Icon *efreet_icon_find_helper(Efreet_Icon_Theme *theme, -const char *cache_key, -const char *icon, -const char *size); -static Efreet_Icon *efreet_icon_list_find_helper(Efreet_Icon_Theme *theme, -Ecore_List *cache_keys, -Ecore_List *icons, -const char *size); -static Efreet_Icon *efreet_icon_lookup_icon(Efreet_Icon_Theme *theme, -const char *icon_name, -const char *size); -static Efreet_Icon *efreet_icon_fallback_icon(const char *icon_name); -static Efreet_Icon *efreet_icon_fallback_dir_scan(const char *dir, -const char *icon_name); - -static Efreet_Icon *efreet_icon_lookup_directory( -Efreet_Icon_Theme *theme, -Efreet_Icon_Theme_Directory *dir, -const char *icon_name); +static char *efreet_icon_find_fallback(Efreet_Icon_Theme *theme, + const char *icon, + const char *size); +static char *efreet_icon_list_find_fallback(Efreet_Icon_Theme *theme, +Ecore_List *icons, +const char *size); +static char *efreet_icon_find_helper(Efreet_Icon_Theme *theme, + const char *icon, const char *size); +static char *efreet_icon_list_find_helper(Efreet_Icon_Theme *theme, + Ecore_List *icons, const char *size); +static char *efreet_icon_lookup_icon(Efreet_Icon_Theme *theme, + const char *icon_name, const char *size); +static char *efreet_icon_fallback_icon(const char *icon_name); +static char *efreet_icon_fallback_dir_scan(const char *dir, + const char *icon_name); + +static char *efreet_icon_lookup_directory(Efreet_Icon_Theme *theme, + Efreet_Icon_Theme_Directory *dir, +
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_applications Modified Files: e_int_config_apps.c Log Message: ref and free .desktop files. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_applications/e_int_config_apps.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_apps.c 25 Jul 2007 17:00:50 - 1.3 +++ e_int_config_apps.c 26 Jul 2007 11:27:02 - 1.4 @@ -224,6 +224,7 @@ Ecore_List *apps; apps = ecore_list_new(); + ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free)); menu = efreet_menu_parse(path); if (!menu) return apps; @@ -232,6 +233,7 @@ while ((entry = ecore_list_next(menu->entries))) { if (entry->type != EFREET_MENU_ENTRY_DESKTOP) continue; + efreet_desktop_ref(entry->desktop); ecore_list_append(apps, entry->desktop); } efreet_menu_free(menu); @@ -246,10 +248,15 @@ Ecore_List *apps; apps = ecore_list_new(); + ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free)); order = e_order_new(path); for (l = order->desktops; l; l = l->next) - ecore_list_append(apps, l->data); + { + efreet_desktop_ref(l->data); + ecore_list_append(apps, l->data); + } + e_object_del(E_OBJECT(order)); return apps; } @@ -372,7 +379,7 @@ while ((desk = ecore_list_next(cfdata->apps))) e_order_append(order, desk); - //XXX need a way to free an E_Order + e_object_del(E_OBJECT(order)); return 1; } @@ -604,7 +611,13 @@ desk = efreet_desktop_get(cfdata->fav); if (!desk) return; if (ecore_list_goto(cfdata->apps, desk)) - ecore_list_remove(cfdata->apps); + { + Efreet_Desktop *tmp; + + tmp = ecore_list_remove(cfdata->apps); + efreet_desktop_free(tmp); + } + efreet_desktop_free(desk); } static void @@ -646,11 +659,16 @@ if (ecore_list_goto(cfdata->apps, desk)) { + Efreet_Desktop *tmp; + i = ecore_list_index(cfdata->apps); - ecore_list_remove(cfdata->apps); + tmp = ecore_list_remove(cfdata->apps); ecore_list_index_goto(cfdata->apps, (i - 1)); ecore_list_insert(cfdata->apps, desk); + efreet_desktop_free(tmp); } + else + efreet_desktop_free(desk); } static void @@ -692,9 +710,14 @@ if (ecore_list_goto(cfdata->apps, desk)) { + Efreet_Desktop *tmp; + i = ecore_list_index(cfdata->apps); - ecore_list_remove(cfdata->apps); + tmp = ecore_list_remove(cfdata->apps); ecore_list_index_goto(cfdata->apps, (i + 1)); ecore_list_insert(cfdata->apps, desk); + efreet_desktop_free(tmp); } + else + efreet_desktop_free(desk); } - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: Always free Efreet_Desktop structs. === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- e_eap_editor.c 25 Jul 2007 17:00:50 - 1.86 +++ e_eap_editor.c 26 Jul 2007 11:17:27 - 1.87 @@ -314,7 +314,7 @@ static void _e_desktop_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - if (cfdata->desktop && cfdata->editor->new_desktop && !cfdata->editor->saved) + if (cfdata->desktop) efreet_desktop_free(cfdata->desktop); if (cfdata->editor->tmp_image_path) - 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
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_test.c Log Message: No longer relevant. === RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_test.c4 Jul 2007 11:11:02 - 1.78 +++ e_test.c26 Jul 2007 11:15:59 - 1.79 @@ -669,18 +669,6 @@ e_color_dialog_select_callback_set(d, _e_test_cb_ok, NULL); } -#elif 0 - -static void -_e_test_internal(E_Container *con) -{ - Efreet_Desktop *desktop; - - desktop = efreet_desktop_get("/home/rephorm/inkscape.desktop"); - - e_desktop_edit_show(con, desktop); -} - #else static void _e_test_internal(E_Container *con) - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/bin Modified Files: ef_desktop.c Log Message: All pointers aquired with efreet_desktop_get should be free'd with efreet_desktop_free now. === RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_desktop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ef_desktop.c25 Jul 2007 17:00:56 - 1.6 +++ ef_desktop.c26 Jul 2007 10:20:24 - 1.7 @@ -68,6 +68,8 @@ } else ret = 0; +efreet_desktop_free(desktop); + return ret; } @@ -132,6 +134,7 @@ } printf("save data: %d\n", efreet_desktop_save(desktop)); +efreet_desktop_free(desktop); desktop = efreet_desktop_empty_new("/tmp/test.desktop"); desktop->name = strdup("Efreet Test Application"); @@ -144,12 +147,7 @@ ecore_list_append(desktop->categories, strdup("Enlightenment")); printf("save test: %d\n", efreet_desktop_save(desktop)); unlink("/tmp/test.desktop"); -#if 0 -/* After saving a .desktop, it should be in the cache. This should then - * be destroyed with it. */ -ecore_list_destroy(desktop->categories); -desktop->categories = NULL; -#endif +efreet_desktop_free(desktop); return 1; } @@ -365,6 +363,7 @@ Efreet_Desktop *desktop; int my_type; char *val; +int ret = 1; /* add my custom desktop type to efreet */ my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL, @@ -380,17 +379,18 @@ if (desktop->type != my_type) { printf("Invalid type returned in desktop"); -return 0; +ret = 0; } val = (char *)efreet_desktop_type_data_get(desktop); if (!val || strcmp(val, "Own key")) { printf("Invalid value of custom key (%s).\n", val); -return 0; +ret = 0; } -return 1; +efreet_desktop_free(desktop); +return ret; } - 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
E CVS: libs/efreet englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_menu.c efreet_utils.c Log Message: All pointers aquired with efreet_desktop_get should be free'd with efreet_desktop_free now. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_menu.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- efreet_menu.c 25 Jul 2007 17:00:56 - 1.19 +++ efreet_menu.c 26 Jul 2007 10:20:24 - 1.20 @@ -2472,6 +2472,7 @@ efreet_menu_desktop_free(Efreet_Menu_Desktop *md) { IF_RELEASE(md->id); +if (md->desktop) efreet_desktop_free(md->desktop); FREE(md); } @@ -3414,6 +3415,7 @@ { internal->directory_cache = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(internal->directory_cache, ECORE_FREE_CB(free)); +ecore_hash_free_value_cb_set(internal->directory_cache, ECORE_FREE_CB(efreet_desktop_free)); ecore_dlist_last_goto(internal->directory_dirs); while ((path = ecore_dlist_previous(internal->directory_dirs))) === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- efreet_utils.c 25 Jul 2007 17:00:56 - 1.42 +++ efreet_utils.c 26 Jul 2007 10:20:24 - 1.43 @@ -76,6 +76,8 @@ static void efreet_util_desktops_by_category_add(Efreet_Desktop *desktop); static void efreet_util_desktops_by_category_remove(Efreet_Desktop *desktop); +static void efreet_util_desktop_free(Efreet_Util_Desktop *ud); + static Ecore_Hash *desktop_by_file_id = NULL; static Ecore_Hash *file_id_by_desktop_path = NULL; static Ecore_Hash *desktops_by_category = NULL; @@ -103,7 +105,7 @@ EFREET_EVENT_DESKTOP_CHANGE = ecore_event_type_new(); desktop_by_file_id = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(desktop_by_file_id, ECORE_FREE_CB(ecore_string_release)); -ecore_hash_free_value_cb_set(desktop_by_file_id, free); +ecore_hash_free_value_cb_set(desktop_by_file_id, ECORE_FREE_CB(efreet_util_desktop_free)); file_id_by_desktop_path = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(file_id_by_desktop_path, ECORE_FREE_CB(ecore_string_release)); @@ -1043,4 +1045,13 @@ ecore_list_destroy(list); } } +} + +static void +efreet_util_desktop_free(Efreet_Util_Desktop *ud) +{ +if (!ud) return; + +efreet_desktop_free(ud->desktop); +free(ud); } - 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
E CVS: winselector englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : winselector Dir : e_modules/winselector Modified Files: e_mod_main.c Log Message: Fix warnings. === RCS file: /cvs/e/e_modules/winselector/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c22 Jul 2007 21:15:04 - 1.14 +++ e_mod_main.c26 Jul 2007 07:48:21 - 1.15 @@ -241,7 +241,7 @@ _win_menu_pre_cb(void *data, E_Menu *m) { E_Menu_Item *mi; - Evas_List *l, *borders = NULL, *alt = NULL; + Evas_List *l, *borders = NULL; E_Zone *zone = NULL; E_Desk *desk = NULL; Instance *inst; @@ -497,16 +497,6 @@ } -static Evas_List *_win_menu_sort_by_orientation(Evas_List *list, E_Gadcon_Orient orient) -{ - if (orient == E_GADCON_ORIENT_BOTTOM -|| orient == E_GADCON_ORIENT_CORNER_BL -|| orient == E_GADCON_ORIENT_CORNER_BR -|| orient == E_GADCON_ORIENT_CORNER_RB -|| orient == E_GADCON_ORIENT_CORNER_LB) - return evas_list_reverse(list); -} - static int _win_menu_sort_alpha_cb(void *d1, void *d2) { E_Border *bd1; @@ -792,7 +782,6 @@ static int _win_menu_fill_iconified(Evas_List *borders, E_Menu *m) { Evas_List *l; - E_Menu_Item *mi; if (evas_list_count(borders) > 0) { - 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
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: e_mod_main.c Log Message: Formatting. === RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- e_mod_main.c26 Jul 2007 07:43:50 - 1.55 +++ e_mod_main.c26 Jul 2007 07:46:28 - 1.56 @@ -537,8 +537,7 @@ inst->bufsize = 0; inst->cursize = 0; - free (inst->buffer); - inst->buffer = NULL; + E_FREE (inst->buffer); return 0; } @@ -587,14 +586,14 @@ needle = strstr (needle, ">"); sscanf (needle, ">%[^<]<", location); - E_FREE(inst->location); + E_FREE (inst->location); if (location[0]) { char *tmp = strdup (location); if (strstr (tmp, ",")) inst->location = strdup (strtok (tmp, ",")); - free(tmp); + free (tmp); } needle = strstr (inst->buffer, ""); - 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
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: e_mod_main.c Log Message: Fix memleak === RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- e_mod_main.c26 Jul 2007 07:39:48 - 1.54 +++ e_mod_main.c26 Jul 2007 07:43:50 - 1.55 @@ -587,15 +587,14 @@ needle = strstr (needle, ">"); sscanf (needle, ">%[^<]<", location); + E_FREE(inst->location); if (location[0]) { char *tmp = strdup (location); if (strstr (tmp, ",")) - { - tmp = strtok (tmp, ","); - inst->location = strdup (tmp); - } + inst->location = strdup (strtok (tmp, ",")); + free(tmp); } needle = strstr (inst->buffer, ""); - 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
E CVS: weather englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : weather Dir : e_modules/weather Modified Files: e_mod_main.c Log Message: location isn't dynamically allocated. === RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- e_mod_main.c30 Mar 2007 20:55:04 - 1.53 +++ e_mod_main.c26 Jul 2007 07:39:48 - 1.54 @@ -573,6 +573,8 @@ char *needle, *ext; char location[256]; + location[0] = 0; + inst = data; if (!inst) return 0; @@ -585,7 +587,7 @@ needle = strstr (needle, ">"); sscanf (needle, ">%[^<]<", location); - if (location) + if (location[0]) { char *tmp = strdup (location); - 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
E CVS: language englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_main.c Log Message: Function prototype has changed. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_mod_main.c29 May 2007 16:26:01 - 1.26 +++ e_mod_main.c26 Jul 2007 07:39:19 - 1.27 @@ -486,7 +486,7 @@ static void _language_face_cb_menu_keybindings_configure(void *data, E_Menu *m, E_Menu_Item *mi) { - e_int_config_keybindings(e_container_current_get(e_manager_current_get())); + e_int_config_keybindings(e_container_current_get(e_manager_current_get()), NULL); } static void _language_face_cb_menu_switch_language_to(void *data, E_Menu *m, E_Menu_Item *mi) - 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