]> git.pld-linux.org Git - packages/xfce4-panel.git/commitdiff
- prefer generic applications.menu
authorJan Rękorajski <baggins@pld-linux.org>
Mon, 15 Nov 2010 12:53:31 +0000 (12:53 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    xfce4-panel-generic-menu.patch -> 1.1

xfce4-panel-generic-menu.patch [new file with mode: 0644]

diff --git a/xfce4-panel-generic-menu.patch b/xfce4-panel-generic-menu.patch
new file mode 100644 (file)
index 0000000..c4e8d76
--- /dev/null
@@ -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
This page took 0.261982 seconds and 4 git commands to generate.