summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-04-12 16:54:21 -0400
committerColin Walters <walters@verbum.org>2011-04-12 16:54:21 -0400
commit8498d1f76e8d6af021f230bd8cd1c1ee4b323473 (patch)
tree205c6a504342f02390eb49f399ea8a6b467bacfd
parent21efec3e1571586e594ebab81c6bf37e05f1d7fd (diff)
downloadgnome-panel-8498d1f76e8d6af021f230bd8cd1c1ee4b323473.tar.gz
gnome-panel-8498d1f76e8d6af021f230bd8cd1c1ee4b323473.tar.xz
gnome-panel-8498d1f76e8d6af021f230bd8cd1c1ee4b323473.zip
Use gnome menu, not redhat-menus
-rw-r--r--gnome-panel-use-gnome-menus.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
new file mode 100644
index 0000000..b2584d6
--- /dev/null
+++ b/gnome-panel-use-gnome-menus.patch
@@ -0,0 +1,61 @@
+--- gnome-panel/menu.c~ 2011-03-29 10:20:47.000000000 -0400
++++ gnome-panel/menu.c 2011-04-11 13:51:30.624874438 -0400
+@@ -1383,7 +1383,7 @@
+ {
+ GtkWidget *main_menu;
+
+- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++ main_menu = create_applications_menu ("applications-gnome.menu", NULL, TRUE);
+
+ g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
+ /* FIXME need to update the panel on parent_set */
+--- gnome-panel/panel-menu-button.c~ 2011-04-04 12:09:04.000000000 -0400
++++ gnome-panel/panel-menu-button.c 2011-04-11 13:51:45.021693156 -0400
+@@ -74,7 +74,7 @@
+ } MenuPathRootItem;
+
+ static MenuPathRootItem root_items [] = {
+- { APPLICATIONS_MENU, "applications", "applications.menu" },
++ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
+ };
+
+--- gnome-panel/panel-run-dialog.c~ 2011-03-28 17:08:42.000000000 -0400
++++ gnome-panel/panel-run-dialog.c 2011-04-11 13:52:56.978793618 -0400
+@@ -867,7 +867,7 @@
+ GMenuTreeDirectory *root;
+ GSList *retval;
+
+- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
++ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
+ gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+
+ root = gmenu_tree_get_root_directory (tree);
+--- gnome-panel/panel-menu-bar.c~ 2011-04-05 06:39:04.000000000 -0400
++++ gnome-panel/panel-menu-bar.c 2011-04-11 13:51:57.430534186 -0400
+@@ -129,7 +129,7 @@
+
+ menubar->priv->info = NULL;
+
+- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++ menubar->priv->applications_menu = create_applications_menu ("applications-gnome.menu", NULL, TRUE);
+
+ menubar->priv->applications_item = panel_image_menu_item_new ();
+ gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
+--- gnome-panel/panel-addto.c~ 2011-04-01 06:39:58.000000000 -0400
++++ gnome-panel/panel-addto.c 2011-04-11 13:52:08.655397696 -0400
+@@ -714,12 +714,12 @@
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
+
+- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
++ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
+ gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+
+ if ((root = gmenu_tree_get_root_directory (tree))) {
+ panel_addto_make_application_list (&dialog->application_list,
+- root, "applications.menu",
++ root, "applications-gnome.menu",
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
+