From 8498d1f76e8d6af021f230bd8cd1c1ee4b323473 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 12 Apr 2011 16:54:21 -0400 Subject: Use gnome menu, not redhat-menus --- gnome-panel-use-gnome-menus.patch | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 gnome-panel-use-gnome-menus.patch 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); + -- cgit