projects / packages / mate-panel.git / blame
| Commit | Line | Data |
|---|---|---|
| ee8e5e1a ER |
1 | --- mate-panel-1.5.3/./mate-panel/panel-menu-bar.c~ 2012-12-20 00:48:49.000000000 +0200 |
| 2 | +++ mate-panel-1.5.3/./mate-panel/panel-menu-bar.c 2013-01-16 12:07:54.282974605 +0200 | |
| 3 | @@ -116,7 +116,7 @@ | |
| 4 | menubar->priv->info = NULL; | |
| 5 | ||
| 6 | ||
| 7 | - menubar->priv->applications_menu = create_applications_menu("mate-applications.menu", NULL, TRUE); | |
| 8 | + menubar->priv->applications_menu = create_applications_menu("applications.menu", NULL, TRUE); | |
| 9 | ||
| 10 | menubar->priv->applications_item = panel_image_menu_item_new(); | |
| 11 | gtk_menu_item_set_label(GTK_MENU_ITEM(menubar->priv->applications_item), _("Applications")); | |
| 12 | --- mate-panel-1.5.3/./mate-panel/menu.c~ 2012-12-20 00:48:49.000000000 +0200 | |
| 13 | +++ mate-panel-1.5.3/./mate-panel/menu.c 2013-01-16 12:08:04.950133393 +0200 | |
| 14 | @@ -1793,7 +1793,7 @@ | |
| 15 | { | |
| 16 | GtkWidget* main_menu; | |
| 17 | ||
| 18 | - main_menu = create_applications_menu("mate-applications.menu", NULL, TRUE); | |
| 19 | + main_menu = create_applications_menu("applications.menu", NULL, TRUE); | |
| 20 | ||
| 21 | g_object_set_data(G_OBJECT(main_menu), "menu_panel", panel); | |
| 22 | /* FIXME need to update the panel on parent_set */ | |
| 23 | --- mate-panel-1.5.3/./mate-panel/panel-menu-button.c~ 2012-12-20 00:48:49.000000000 +0200 | |
| 24 | +++ mate-panel-1.5.3/./mate-panel/panel-menu-button.c 2013-01-16 12:08:17.590716557 +0200 | |
| 25 | @@ -77,7 +77,7 @@ | |
| 26 | } MenuPathRootItem; | |
| 27 | ||
| 28 | static MenuPathRootItem root_items[] = { | |
| 29 | - {APPLICATIONS_MENU, "mate-applications", "mate-applications.menu"}, | |
| 30 | + {APPLICATIONS_MENU, "applications", "applications.menu"}, | |
| 31 | {SETTINGS_MENU, "mate-settings", "mate-settings.menu"} | |
| 32 | }; | |
| 33 | ||
| 34 | --- mate-panel-1.5.3/./mate-panel/panel-addto.c~ 2012-12-20 00:48:50.000000000 +0200 | |
| 35 | +++ mate-panel-1.5.3/./mate-panel/panel-addto.c 2013-01-16 12:08:31.741369388 +0200 | |
| 36 | @@ -692,12 +692,12 @@ | |
| 37 | ||
| 38 | store = gtk_tree_store_new(NUMBER_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); | |
| 39 | ||
| 40 | - tree = matemenu_tree_lookup("mate-applications.menu", MATEMENU_TREE_FLAGS_NONE); | |
| 41 | + tree = matemenu_tree_lookup("applications.menu", MATEMENU_TREE_FLAGS_NONE); | |
| 42 | matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME); | |
| 43 | ||
| 44 | if ((root = matemenu_tree_get_root_directory (tree))) | |
| 45 | { | |
| 46 | - panel_addto_make_application_list(&dialog->application_list, root, "mate-applications.menu"); | |
| 47 | + panel_addto_make_application_list(&dialog->application_list, root, "applications.menu"); | |
| 48 | panel_addto_populate_application_model(store, NULL, dialog->application_list); | |
| 49 | ||
| 50 | matemenu_tree_item_unref(root); | |
| 51 | --- mate-panel-1.5.3/./mate-panel/panel-run-dialog.c~ 2012-12-20 00:48:50.000000000 +0200 | |
| 52 | +++ mate-panel-1.5.3/./mate-panel/panel-run-dialog.c 2013-01-16 12:08:41.471818295 +0200 | |
| 53 | @@ -857,7 +857,7 @@ | |
| 54 | MateMenuTreeDirectory* root; | |
| 55 | GSList* retval; | |
| 56 | ||
| 57 | - tree = matemenu_tree_lookup("mate-applications.menu", MATEMENU_TREE_FLAGS_NONE); | |
| 58 | + tree = matemenu_tree_lookup("applications.menu", MATEMENU_TREE_FLAGS_NONE); | |
| 59 | matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME); | |
| 60 | ||
| 61 | root = matemenu_tree_get_root_directory(tree); |