Enlightenment CVS committal

Author  : morlenxus
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_main.c 


Log Message:
Removed ~/.e/e/applications/all as it isn't used anymore. Correct dir is 
~/.local/share/applications, so applications.tar.gz was parted into 
desktop_files.tar.gz which contains the .desktop files and is extracted to 
~/.local/share/applications/ and desktop_order.tar.gz which contains the menu 
and bar files and is extracted to ~/.e/e/ .

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -3 -r1.236 -r1.237
--- e_main.c    7 Oct 2007 17:02:07 -0000       1.236
+++ e_main.c    13 Oct 2007 11:28:54 -0000      1.237
@@ -1026,7 +1026,6 @@
        "%s/.e/e/icons",
        "%s/.e/e/backgrounds",
        "%s/.e/e/applications",
-       "%s/.e/e/applications/all",
        "%s/.e/e/applications/menu",
        "%s/.e/e/applications/menu/favorite",
        "%s/.e/e/applications/menu/all",
@@ -1057,6 +1056,17 @@
               }
          }
      }
+   snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get());
+   if (!ecore_file_mkpath(buf))
+     {
+       if (!ecore_file_is_dir(buf))
+         {
+            e_error_message_show("Error creating directory:\n"
+                                 "%s",
+                                 buf);
+            return 0;
+         }
+     }
    
    /* FIXME: THIS is a hack to get people started!!! */
    /* err dont just disable it - replace it with a proper wizard tool */
@@ -1066,8 +1076,14 @@
    if (!ecore_file_exists(buf))
      {
        snprintf(buf, sizeof(buf), 
-                "gzip -d -c < %s/data/other/applications.tar.gz | "
-                "(cd %s/.e/e/ ; tar -xf -)", 
+                "gzip -d -c < %s/data/other/desktop_files.tar.gz | "
+                "(cd %s/applications/ ; tar -xkf -)", 
+                e_prefix_data_get(),
+                efreet_data_home_get());
+       system(buf);
+       snprintf(buf, sizeof(buf), 
+                "gzip -d -c < %s/data/other/desktop_order.tar.gz | "
+                "(cd %s/.e/e/ ; tar -xkf -)", 
                 e_prefix_data_get(),
                 homedir);
        system(buf);
@@ -1078,7 +1094,7 @@
      {
        snprintf(buf, sizeof(buf), 
                 "gzip -d -c < %s/data/other/efm_favorites.tar.gz | "
-                "(cd %s/.e/e/ ; tar -xf -)", 
+                "(cd %s/.e/e/ ; tar -xkf -)", 
                 e_prefix_data_get(),
                 homedir);
        system(buf);



-------------------------------------------------------------------------
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

Reply via email to