Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_eap_editor.c 


Log Message:
If the desktop editor dialog is closed, close any open icon selector dialog.
This fixes a nasty segfault if you closed the editor dialog while the icon
selector dialog was open.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- e_eap_editor.c      17 Apr 2008 03:07:51 -0000      1.95
+++ e_eap_editor.c      7 Jun 2008 18:31:08 -0000       1.96
@@ -313,9 +313,9 @@
    if (cfdata->desktop) efreet_desktop_free(cfdata->desktop);
    if (cfdata->editor->tmp_image_path) 
      {
-       if (!cfdata->desktop || !cfdata->editor->saved || 
-           !cfdata->desktop->icon ||
-           strcmp(cfdata->editor->tmp_image_path, cfdata->desktop->icon))
+       if ((!cfdata->desktop) || (!cfdata->editor->saved) || 
+           (!cfdata->desktop->icon) ||
+           (strcmp(cfdata->editor->tmp_image_path, cfdata->desktop->icon)))
          {
             ecore_file_unlink(cfdata->editor->tmp_image_path);
          }
@@ -330,6 +330,9 @@
    IFFREE(cfdata->categories);
    IFFREE(cfdata->icon);
    IFFREE(cfdata->mimes);
+
+   if (cfdata->editor->icon_fsel_dia) 
+     e_object_del(E_OBJECT(cfdata->editor->icon_fsel_dia));
 
    e_object_del(E_OBJECT(cfdata->editor));
    free(cfdata);



-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to