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.c 25 Jul 2007 17:00:56 -0000 1.6
+++ ef_desktop.c 26 Jul 2007 10:20:24 -0000 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
