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 -0000      1.20
+++ efreet_menu.c       26 Jul 2007 11:40:04 -0000      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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to