|
 |
126c5e1 |
diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
|
|
|
126c5e1 |
--- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
|
|
|
126c5e1 |
+++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
|
|
|
126c5e1 |
@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
|
|
Colin Walters |
8498d1f |
{
|
|
Colin Walters |
8498d1f |
GtkWidget *main_menu;
|
|
Colin Walters |
8498d1f |
|
|
Colin Walters |
8498d1f |
- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
|
|
Daniel Drake |
65593fe |
+ main_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
|
|
Colin Walters |
8498d1f |
|
|
Colin Walters |
8498d1f |
g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
|
|
Colin Walters |
8498d1f |
/* FIXME need to update the panel on parent_set */
|
|
|
126c5e1 |
diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus gnome-panel-3.1.5/gnome-panel/panel-addto.c
|
|
|
126c5e1 |
--- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000 -0400
|
|
|
126c5e1 |
+++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
|
|
|
126c5e1 |
@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
|
|
|
126c5e1 |
G_TYPE_POINTER,
|
|
|
126c5e1 |
G_TYPE_STRING);
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
|
|
|
126c5e1 |
+ tree = gmenu_tree_new ("applications-gnome.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
if (!gmenu_tree_load_sync (tree, NULL)) {
|
|
|
126c5e1 |
g_object_unref (tree);
|
|
|
126c5e1 |
@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
|
|
|
126c5e1 |
panel_addto_make_application_list (&dialog->application_list,
|
|
|
126c5e1 |
- root, "applications.menu",
|
|
Daniel Drake |
65593fe |
+ root, "gnome-applications.menu",
|
|
|
126c5e1 |
PANEL_ADDTO_MENU_SHOW_ALL);
|
|
|
126c5e1 |
panel_addto_populate_application_model (store, NULL, dialog->application_list);
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
|
|
|
126c5e1 |
--- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000 -0400
|
|
|
126c5e1 |
+++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
|
|
|
126c5e1 |
@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
|
|
Colin Walters |
8498d1f |
|
|
Colin Walters |
8498d1f |
menubar->priv->info = NULL;
|
|
Colin Walters |
8498d1f |
|
|
Colin Walters |
8498d1f |
- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
|
|
Daniel Drake |
65593fe |
+ menubar->priv->applications_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE);
|
|
Colin Walters |
8498d1f |
|
|
Colin Walters |
8498d1f |
menubar->priv->applications_item = panel_image_menu_item_new ();
|
|
Colin Walters |
8498d1f |
gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
|
|
|
126c5e1 |
diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
|
|
|
126c5e1 |
--- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000 -0400
|
|
|
126c5e1 |
+++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917 -0400
|
|
|
126c5e1 |
@@ -74,7 +74,7 @@ typedef struct {
|
|
|
126c5e1 |
} MenuPathRootItem;
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
static MenuPathRootItem root_items [] = {
|
|
|
126c5e1 |
- { APPLICATIONS_MENU, "applications", "applications.menu" },
|
|
Daniel Drake |
65593fe |
+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
|
|
|
126c5e1 |
{ GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
|
|
|
126c5e1 |
};
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
|
|
|
126c5e1 |
--- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000 -0400
|
|
|
126c5e1 |
+++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
|
|
|
126c5e1 |
@@ -781,7 +781,7 @@ get_all_applications (void)
|
|
|
126c5e1 |
GMenuTreeDirectory *root;
|
|
|
126c5e1 |
GSList *retval;
|
|
|
126c5e1 |
|
|
|
126c5e1 |
- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
|
|
Daniel Drake |
65593fe |
+ tree = gmenu_tree_new ("gnome-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
|
|
Colin Walters |
8498d1f |
|
|
|
126c5e1 |
if (!gmenu_tree_load_sync (tree, NULL))
|
|
|
126c5e1 |
return NULL;
|