The directory icons will be called .directory as per the FDE spec. This

will likely be implemented later today.

SVN revision: 26580

diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index 9fce55c..09fd069 100644 (file)
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -433,7 +433,7 @@ e_app_new(const char *path, int scan_subdirs)
            {
                if ((!a->idle_fill) && (!a->filled))
                 {
-                   snprintf(buf, sizeof(buf), "%s/.directory.desktop", path);
+                   snprintf(buf, sizeof(buf), "%s/.directory", path);
                    if (ecore_file_exists(buf))
                       e_app_fields_fill(a, buf);
                    else
@@ -2469,7 +2469,7 @@ _e_app_cb_monitor(void *data, Ecore_File_Monitor *em,
             printf("BUG: Weird event for .order: %d\n", event);
          }
      }
-   else if (!strcmp(file, ".directory.desktop"))
+   else if (!strcmp(file, ".directory"))
      {
        if ((event == ECORE_FILE_EVENT_CREATED_FILE) ||
            (event == ECORE_FILE_EVENT_MODIFIED))
@@ -2495,7 +2495,7 @@ _e_app_cb_monitor(void *data, Ecore_File_Monitor *em,
          }
        else
          {
-            printf("BUG: Weird event for .directory.desktop: %d\n", event);
+            printf("BUG: Weird event for .directory: %d\n", event);
          }
      }
    else

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index e3b34cc..9bf2e20 100644 (file)
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -487,7 +487,7 @@ _e_int_menus_apps_scan(E_Menu *m)
                       char buf[4096];
                       
                        /* FIXME: .directory.eaps are obsolete, but have yet to be replaced by FDO stuff. */
-                      snprintf(buf, sizeof(buf), "%s/.directory.desktop", a->path);
+                      snprintf(buf, sizeof(buf), "%s/.directory", a->path);
                       if (!((a->icon_class) && 
                             (e_util_menu_item_edje_icon_list_set(mi, a->icon_class))))
                          /*e_menu_item_icon_edje_set(mi, buf, "icon")*/;