Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_fm.c 


Log Message:
This should fix the random e_fm segfaults when opening directories for good.
Seems we cannot rely on icon smart data being valid.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- e_fm.c      1 Oct 2007 18:52:43 -0000       1.207
+++ e_fm.c      2 Oct 2007 00:16:09 -0000       1.208
@@ -1102,7 +1102,7 @@
          }
        else
          {
-            if ((ic->info.mime) && (ic->info.file) && (ic->sd->realpath))
+            if ((ic->info.mime) && (ic->info.file))
               {
                  const char *icon;
                  
@@ -1110,8 +1110,9 @@
                  if (!strcmp(icon, "DESKTOP"))
                    {
                       Efreet_Desktop *ef;
-                      
-                      snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, 
ic->info.file);
+
+                      snprintf(buf, sizeof(buf), "%s/%s", 
+                               e_fm2_real_path_get(ic->info.fm), 
ic->info.file);
                       ef = efreet_desktop_new(buf);
                       if (ef) oic = e_util_desktop_icon_add(ef, "48x48", evas);
                       if (type_ret) *type_ret = "DESKTOP";
@@ -1122,7 +1123,8 @@
               {
                  /* theme icon */
                  oic = edje_object_add(evas);
-                 e_util_edje_icon_set(oic, ic->info.icon);
+                 if (ic->info.icon) 
+                   e_util_edje_icon_set(oic, ic->info.icon);
                  if (type_ret) *type_ret = "THEME_ICON";
               }
          }



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to