Author: baggins Date: Mon Nov 15 12:53:36 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- prefer generic applications.menu
---- Files affected:
packages/xfce4-panel:
xfce4-panel-generic-menu.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xfce4-panel/xfce4-panel-generic-menu.patch
diff -u /dev/null packages/xfce4-panel/xfce4-panel-generic-menu.patch:1.1
--- /dev/null Mon Nov 15 13:53:36 2010
+++ packages/xfce4-panel/xfce4-panel-generic-menu.patch Mon Nov 15 13:53:31 2010
@@ -0,0 +1,27 @@
+--- xfce4-panel-4.7.4/plugins/applicationsmenu/applicationsmenu.c~
2010-11-03 20:41:40.000000000 +0100
++++ xfce4-panel-4.7.4/plugins/applicationsmenu/applicationsmenu.c
2010-11-15 13:37:28.712464684 +0100
+@@ -945,15 +945,16 @@
+ }
+ else
+ {
+- /* lookup the xfce-applications.menu file */
+- filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG,
DEFAULT_MENU);
+- if (G_LIKELY (filename != NULL))
+- menu = garcon_menu_new_for_path (filename);
+- g_free (filename);
++ /* load default menu */
++ menu = garcon_menu_new_applications ();
+
+- /* fallback to the default menu */
+- if (G_UNLIKELY (menu == NULL))
+- menu = garcon_menu_new_applications ();
++ /* fallback to the xfce-applications.menu file */
++ if (G_UNLIKELY (menu == NULL)) {
++ filename = xfce_resource_lookup (XFCE_RESOURCE_CONFIG,
DEFAULT_MENU);
++ if (G_LIKELY (filename != NULL))
++ menu = garcon_menu_new_for_path (filename);
++ g_free (filename);
++ }
+ }
+
+ if (menu != NULL
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
