[Pkg-e-commits] [SCM] Enlightenment 17 branch, new-svn-snapshot, updated. debian/0.16.999.050+svn20081207-1-7822-gcc26b1c

[Albin Tonnerre]

The following commit has been merged in the new-svn-snapshot branch:
commit 932f789179f3094f721c1e3fad3121ff33730f03
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Sat Jun 20 18:00:26 2009 +0200

    Add 01_menu_extra_path.patch, which was previously in efreet. Allows to use the e17-provided fallback menu is efreet doesn't find any

diff --git a/debian/changelog b/debian/changelog
index 7c7a5d8..c35139c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ e17 (0.16.999.061-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Drop 03_config_panel_category_list_is_not_an_ilist.diff, applied upstream
+  * Add 01_menu_extra_path.patch:
+    - Previously patched in efreet. Allows the use of an e17-provided fallback
+      menu in case efreet doesn't find any.
 
  -- Albin Tonnerre <albin.tonnerre at gmail.com>  Fri, 19 Jun 2009 16:52:16 +0200
 
diff --git a/debian/patches/01_menu_extra_path.patch b/debian/patches/01_menu_extra_path.patch
new file mode 100644
index 0000000..4068d92
--- /dev/null
+++ b/debian/patches/01_menu_extra_path.patch
@@ -0,0 +1,18 @@
+diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
+index 16a2d3b..7c2827e 100644
+--- a/src/bin/e_int_menus.c
++++ b/src/bin/e_int_menus.c
+@@ -593,6 +593,13 @@ _e_int_menus_apps_start(void *data, E_Menu *m)
+ 	     free(dir);
+ 	  }
+ 	else menu = efreet_menu_get();
++	if(!menu)
++	  {
++	     char buf[PATH_MAX];
++	     snprintf(buf, sizeof(buf), "/etc/xdg/menus/enlightenment-applications.menu");
++	     if (ecore_file_exists(buf))
++	       menu = efreet_menu_parse(buf);
++	  }
+ 	e_object_data_set(E_OBJECT(m), menu);
+ 	e_object_free_attach_func_set(E_OBJECT(m), 
+                                       _e_int_menus_apps_free_hook2);

-- 
Enlightenment 17