GNOME Panel

Merge lp:~muktupavels/gnome-panel/fix-menus-in-gnome-flashback-session-real into lp:ubuntu/trusty/gnome-panel

  1. fix-menus-in-gnome-flashback-session-real
  2. Merge into trusty
Proposed by Alberts Muktupāvels
Status: Merged
Merged at revision: 255
Proposed branch: lp:~muktupavels/gnome-panel/fix-menus-in-gnome-flashback-session-real
Merge into: lp:ubuntu/trusty/gnome-panel
Diff against target: 169 lines (+63/-18)
7 files modified
debian/changelog (+7/-0)
debian/patches/01_menus_rename.patch (+50/-12)
gnome-panel/menu.c (+1/-1)
gnome-panel/panel-addto.c (+2/-2)
gnome-panel/panel-menu-bar.c (+1/-1)
gnome-panel/panel-menu-button.c (+1/-1)
gnome-panel/panel-run-dialog.c (+1/-1)
To merge this branch: bzr merge lp:~muktupavels/gnome-panel/fix-menus-in-gnome-flashback-session-real
Reviewer Review Type Date Requested Status
Tim Lunn (community) Approve
Ubuntu branches Pending
Review via email: mp+211252@code.launchpad.net

Commit message

Fix menus in gnome-flashback session.

Description of the change

Fix menus in gnome-flashback session.

To post a comment you must log in.
Revision history for this message
Tim Lunn (darkxst) wrote :

thanks, looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-01 14:39:38 +0000
3+++ debian/changelog 2014-03-17 07:12:55 +0000
4@@ -1,3 +1,10 @@
5+gnome-panel (1:3.8.0-1ubuntu10) UNRELEASED; urgency=medium
6+
7+ * Update 01_menus_rename.patch to use separate menus file for
8+ gnome-flashback session (lp: #1267787).
9+
10+ -- Alberts Muktupāvels <alberts.muktupavels@gmail.com> Mon, 17 Mar 2014 09:00:22 +0200
11+
12 gnome-panel (1:3.8.0-1ubuntu9) trusty; urgency=low
13
14 * Revert changes to 41_classic_layout.patch introduced in -1ubuntu4,
15
16=== modified file 'debian/patches/01_menus_rename.patch'
17--- debian/patches/01_menus_rename.patch 2012-05-22 08:59:20 +0000
18+++ debian/patches/01_menus_rename.patch 2014-03-17 07:12:55 +0000
19@@ -1,26 +1,64 @@
20-Index: gnome-panel-3.4.2.1/gnome-panel/panel-menu-button.c
21-===================================================================
22---- gnome-panel-3.4.2.1.orig/gnome-panel/panel-menu-button.c 2012-03-15 09:56:50.000000000 +0100
23-+++ gnome-panel-3.4.2.1/gnome-panel/panel-menu-button.c 2012-05-21 19:22:50.861191796 +0200
24-@@ -73,7 +73,7 @@ typedef struct {
25+--- a/gnome-panel/panel-menu-button.c
26++++ b/gnome-panel/panel-menu-button.c
27+@@ -73,7 +73,7 @@
28 } MenuPathRootItem;
29
30 static MenuPathRootItem root_items [] = {
31 - { APPLICATIONS_MENU, "applications", "applications.menu" },
32-+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
33++ { APPLICATIONS_MENU, "applications", "gnome-flashback-applications.menu" },
34 { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
35 };
36
37-Index: gnome-panel-3.4.2.1/gnome-panel/panel-addto.c
38-===================================================================
39---- gnome-panel-3.4.2.1.orig/gnome-panel/panel-addto.c 2012-03-15 09:56:50.000000000 +0100
40-+++ gnome-panel-3.4.2.1/gnome-panel/panel-addto.c 2012-05-21 19:30:16.079367262 +0200
41-@@ -674,7 +674,7 @@ panel_addto_make_application_model (Pane
42+--- a/gnome-panel/panel-addto.c
43++++ b/gnome-panel/panel-addto.c
44+@@ -665,7 +665,7 @@
45+ G_TYPE_POINTER,
46+ G_TYPE_STRING);
47+
48+- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
49++ tree = gmenu_tree_new ("gnome-flashback-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
50+
51+ if (!gmenu_tree_load_sync (tree, NULL)) {
52+ g_object_unref (tree);
53+@@ -674,7 +674,7 @@
54
55 if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
56 panel_addto_make_application_list (&dialog->application_list,
57 - root, "applications.menu",
58-+ root, "gnome-applications.menu",
59++ root, "gnome-flashback-applications.menu",
60 PANEL_ADDTO_MENU_SHOW_ALL);
61 panel_addto_populate_application_model (store, NULL, dialog->application_list);
62
63+--- a/gnome-panel/menu.c
64++++ b/gnome-panel/menu.c
65+@@ -1401,7 +1401,7 @@
66+ {
67+ GtkWidget *main_menu;
68+
69+- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
70++ main_menu = create_applications_menu ("gnome-flashback-applications.menu", NULL, TRUE);
71+
72+ g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
73+ /* FIXME need to update the panel on parent_set */
74+--- a/gnome-panel/panel-menu-bar.c
75++++ b/gnome-panel/panel-menu-bar.c
76+@@ -116,7 +116,7 @@
77+
78+ menubar->priv->info = NULL;
79+
80+- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
81++ menubar->priv->applications_menu = create_applications_menu ("gnome-flashback-applications.menu", NULL, TRUE);
82+
83+ menubar->priv->applications_item = panel_image_menu_item_new ();
84+ gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
85+--- a/gnome-panel/panel-run-dialog.c
86++++ b/gnome-panel/panel-run-dialog.c
87+@@ -916,7 +916,7 @@
88+ GMenuTreeDirectory *root;
89+ GSList *retval;
90+
91+- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
92++ tree = gmenu_tree_new ("gnome-flashback-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
93+
94+ if (!gmenu_tree_load_sync (tree, NULL))
95+ return NULL;
96
97=== modified file 'gnome-panel/menu.c'
98--- gnome-panel/menu.c 2012-05-25 10:44:35 +0000
99+++ gnome-panel/menu.c 2014-03-17 07:12:55 +0000
100@@ -1401,7 +1401,7 @@
101 {
102 GtkWidget *main_menu;
103
104- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
105+ main_menu = create_applications_menu ("gnome-flashback-applications.menu", NULL, TRUE);
106
107 g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
108 /* FIXME need to update the panel on parent_set */
109
110=== modified file 'gnome-panel/panel-addto.c'
111--- gnome-panel/panel-addto.c 2013-06-19 11:49:35 +0000
112+++ gnome-panel/panel-addto.c 2014-03-17 07:12:55 +0000
113@@ -665,7 +665,7 @@
114 G_TYPE_POINTER,
115 G_TYPE_STRING);
116
117- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
118+ tree = gmenu_tree_new ("gnome-flashback-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
119
120 if (!gmenu_tree_load_sync (tree, NULL)) {
121 g_object_unref (tree);
122@@ -674,7 +674,7 @@
123
124 if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
125 panel_addto_make_application_list (&dialog->application_list,
126- root, "gnome-applications.menu",
127+ root, "gnome-flashback-applications.menu",
128 PANEL_ADDTO_MENU_SHOW_ALL);
129 panel_addto_populate_application_model (store, NULL, dialog->application_list);
130
131
132=== modified file 'gnome-panel/panel-menu-bar.c'
133--- gnome-panel/panel-menu-bar.c 2012-05-25 10:44:35 +0000
134+++ gnome-panel/panel-menu-bar.c 2014-03-17 07:12:55 +0000
135@@ -116,7 +116,7 @@
136
137 menubar->priv->info = NULL;
138
139- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE);
140+ menubar->priv->applications_menu = create_applications_menu ("gnome-flashback-applications.menu", NULL, TRUE);
141
142 menubar->priv->applications_item = panel_image_menu_item_new ();
143 gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
144
145=== modified file 'gnome-panel/panel-menu-button.c'
146--- gnome-panel/panel-menu-button.c 2013-06-19 11:49:35 +0000
147+++ gnome-panel/panel-menu-button.c 2014-03-17 07:12:55 +0000
148@@ -73,7 +73,7 @@
149 } MenuPathRootItem;
150
151 static MenuPathRootItem root_items [] = {
152- { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
153+ { APPLICATIONS_MENU, "applications", "gnome-flashback-applications.menu" },
154 { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
155 };
156
157
158=== modified file 'gnome-panel/panel-run-dialog.c'
159--- gnome-panel/panel-run-dialog.c 2013-11-22 10:20:12 +0000
160+++ gnome-panel/panel-run-dialog.c 2014-03-17 07:12:55 +0000
161@@ -916,7 +916,7 @@
162 GMenuTreeDirectory *root;
163 GSList *retval;
164
165- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
166+ tree = gmenu_tree_new ("gnome-flashback-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
167
168 if (!gmenu_tree_load_sync (tree, NULL))
169 return NULL;

Subscribers

People subscribed via source and target branches