Merge lp:~muktupavels/gnome-panel/improve-fix-for-bug-1310929 into lp:ubuntu/utopic/gnome-panel
- improve-fix-for-bug-1310929
- Merge into utopic
Proposed by
Alberts Muktupāvels
Status: | Merged |
---|---|
Merged at revision: | 258 |
Proposed branch: | lp:~muktupavels/gnome-panel/improve-fix-for-bug-1310929 |
Merge into: | lp:ubuntu/utopic/gnome-panel |
Diff against target: |
568 lines (+76/-281) 21 files modified
.pc/41_classic_layout.patch/data/panel-default-layout.layout (+0/-44) .pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in (+0/-3) .pc/50_ubuntu_sessions.patch/data/Makefile.am (+0/-67) .pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in (+0/-7) .pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in (+0/-3) .pc/50_ubuntu_sessions.patch/po/POTFILES.in (+0/-77) .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in (+0/-18) .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in (+0/-18) .pc/applied-patches (+0/-4) data/Makefile.am (+2/-2) data/gnome-fallback-compiz.desktop.in (+0/-8) data/gnome-fallback.desktop.in.in (+1/-2) data/gnome-flashback-compiz.session.desktop.in (+0/-4) data/gnome-flashback.session.desktop.in (+2/-3) data/panel-default-layout.layout (+17/-10) debian/changelog (+7/-0) debian/patches/40_unset_menuproxy.patch (+35/-4) gnome-panel/gnome-panel.desktop.in (+3/-2) gnome-panel/gnome-panel.desktop.in.in (+3/-2) gnome-panel/libpanel-util/panel-launch.c (+6/-1) po/POTFILES.in (+0/-2) |
To merge this branch: | bzr merge lp:~muktupavels/gnome-panel/improve-fix-for-bug-1310929 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+218622@code.launchpad.net |
Commit message
Again update 40_unset_
Description of the change
Again update 40_unset_
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory '.pc/41_classic_layout.patch' |
2 | === removed directory '.pc/41_classic_layout.patch/data' |
3 | === removed file '.pc/41_classic_layout.patch/data/panel-default-layout.layout' |
4 | --- .pc/41_classic_layout.patch/data/panel-default-layout.layout 2013-11-22 10:20:12 +0000 |
5 | +++ .pc/41_classic_layout.patch/data/panel-default-layout.layout 1970-01-01 00:00:00 +0000 |
6 | @@ -1,44 +0,0 @@ |
7 | -[Toplevel top-panel] |
8 | -expand=true |
9 | -orientation=top |
10 | -size=24 |
11 | - |
12 | -[Toplevel bottom-panel] |
13 | -expand=true |
14 | -orientation=bottom |
15 | -size=24 |
16 | -y-bottom=0 |
17 | - |
18 | -[Object menu-bar] |
19 | -object-iid=PanelInternalFactory::MenuBar |
20 | -toplevel-id=top-panel |
21 | -pack-index=0 |
22 | - |
23 | -[Object clock] |
24 | -object-iid=ClockAppletFactory::ClockApplet |
25 | -toplevel-id=top-panel |
26 | -pack-type=end |
27 | -pack-index=1 |
28 | - |
29 | -[Object notification-area] |
30 | -object-iid=NotificationAreaAppletFactory::NotificationArea |
31 | -toplevel-id=top-panel |
32 | -pack-type=end |
33 | -pack-index=2 |
34 | - |
35 | -[Object user-menu] |
36 | -object-iid=PanelInternalFactory::UserMenu |
37 | -toplevel-id=top-panel |
38 | -pack-type=end |
39 | -pack-index=0 |
40 | - |
41 | -[Object window-list] |
42 | -object-iid=WnckletFactory::WindowListApplet |
43 | -toplevel-id=bottom-panel |
44 | -pack-index=0 |
45 | - |
46 | -[Object workspace-switcher] |
47 | -object-iid=WnckletFactory::WorkspaceSwitcherApplet |
48 | -toplevel-id=bottom-panel |
49 | -pack-type=end |
50 | -pack-index=0 |
51 | |
52 | === removed directory '.pc/49_no_screensaver.patch' |
53 | === removed directory '.pc/49_no_screensaver.patch/data' |
54 | === removed file '.pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in' |
55 | --- .pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in 2014-01-16 12:46:14 +0000 |
56 | +++ .pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in 1970-01-01 00:00:00 +0000 |
57 | @@ -1,3 +0,0 @@ |
58 | -[GNOME Session] |
59 | -_Name=GNOME Flashback |
60 | -RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm; |
61 | |
62 | === removed directory '.pc/50_ubuntu_sessions.patch' |
63 | === removed directory '.pc/50_ubuntu_sessions.patch/data' |
64 | === removed file '.pc/50_ubuntu_sessions.patch/data/Makefile.am' |
65 | --- .pc/50_ubuntu_sessions.patch/data/Makefile.am 2013-11-22 10:20:12 +0000 |
66 | +++ .pc/50_ubuntu_sessions.patch/data/Makefile.am 1970-01-01 00:00:00 +0000 |
67 | @@ -1,67 +0,0 @@ |
68 | -SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable |
69 | - |
70 | -gsettings_applets_schemas_in_in = \ |
71 | - org.gnome.gnome-panel.applet.fish.gschema.xml.in.in \ |
72 | - org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in \ |
73 | - org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in \ |
74 | - org.gnome.gnome-panel.applet.clock.gschema.xml.in.in |
75 | - |
76 | -gsettings_panel_schemas_in_in = \ |
77 | - org.gnome.gnome-panel.gschema.xml.in.in \ |
78 | - org.gnome.gnome-panel.launcher.gschema.xml.in.in \ |
79 | - org.gnome.gnome-panel.menu-button.gschema.xml.in.in \ |
80 | - org.gnome.gnome-panel.object.gschema.xml.in.in \ |
81 | - org.gnome.gnome-panel.toplevel.gschema.xml.in.in |
82 | - |
83 | -gsettings_schemas_in_in = \ |
84 | - $(gsettings_panel_schemas_in_in) \ |
85 | - $(gsettings_applets_schemas_in_in) |
86 | - |
87 | -@INTLTOOL_XML_NOMERGE_RULE@ |
88 | - |
89 | -gsettings_ENUM_NAMESPACE = org.gnome.gnome-panel |
90 | -gsettings_ENUM_FILES = $(top_srcdir)/gnome-panel/panel-enums-gsettings.h |
91 | - |
92 | -gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in) |
93 | -gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml) |
94 | - |
95 | -%.gschema.xml.in: %.gschema.xml.in.in Makefile |
96 | - $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ |
97 | - |
98 | -@GSETTINGS_RULES@ |
99 | - |
100 | -sessiondir = $(datadir)/gnome-session/sessions |
101 | -session_in_files = gnome-flashback.session.desktop.in |
102 | -session_DATA = $(session_in_files:.session.desktop.in=.session) |
103 | - |
104 | -xsessiondir = $(datadir)/xsessions |
105 | -xsession_in_in_files = gnome-fallback.desktop.in.in |
106 | -xsession_in_files = gnome-fallback.desktop.in |
107 | -xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) |
108 | - |
109 | -%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ |
110 | - |
111 | -%.desktop.in: %.desktop.in.in |
112 | - $(AM_V_GEN)sed -e 's,[@]libexecdir[@],$(libexecdir),g' <$< >$@ |
113 | - |
114 | -@INTLTOOL_DESKTOP_RULE@ |
115 | - |
116 | -default_layoutdir = $(datadir)/gnome-panel |
117 | -default_layout_DATA = panel-default-layout.layout |
118 | - |
119 | -EXTRA_DIST = \ |
120 | - $(gsettings_schemas_in_in) \ |
121 | - $(session_in_files) \ |
122 | - $(xsession_in_in_files) \ |
123 | - $(default_layout_DATA) |
124 | - |
125 | -CLEANFILES = \ |
126 | - $(gsettings__enum_file) \ |
127 | - $(gsettings_SCHEMAS_in) \ |
128 | - $(gsettings_SCHEMAS) \ |
129 | - *.gschema.valid \ |
130 | - $(session_DATA) \ |
131 | - $(xsession_DATA) \ |
132 | - $(xsession_in_files) |
133 | - |
134 | --include $(top_srcdir)/git.mk |
135 | |
136 | === removed file '.pc/50_ubuntu_sessions.patch/data/gnome-fallback-compiz.desktop.in' |
137 | === removed file '.pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in' |
138 | --- .pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in 2013-11-22 10:20:12 +0000 |
139 | +++ .pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in 1970-01-01 00:00:00 +0000 |
140 | @@ -1,7 +0,0 @@ |
141 | -[Desktop Entry] |
142 | -_Name=GNOME Flashback |
143 | -_Comment=This session logs you into GNOME with the traditional panel |
144 | -Exec=@libexecdir@/gnome-session-flashback |
145 | -TryExec=@libexecdir@/gnome-session-flashback |
146 | -Icon= |
147 | -Type=Application |
148 | |
149 | === removed file '.pc/50_ubuntu_sessions.patch/data/gnome-flashback-compiz.session.desktop.in' |
150 | === removed file '.pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in' |
151 | --- .pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in 2014-01-16 12:46:14 +0000 |
152 | +++ .pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in 1970-01-01 00:00:00 +0000 |
153 | @@ -1,3 +0,0 @@ |
154 | -[GNOME Session] |
155 | -_Name=GNOME Flashback |
156 | -RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-wm; |
157 | |
158 | === removed directory '.pc/50_ubuntu_sessions.patch/po' |
159 | === removed file '.pc/50_ubuntu_sessions.patch/po/POTFILES.in' |
160 | --- .pc/50_ubuntu_sessions.patch/po/POTFILES.in 2013-11-22 10:20:12 +0000 |
161 | +++ .pc/50_ubuntu_sessions.patch/po/POTFILES.in 1970-01-01 00:00:00 +0000 |
162 | @@ -1,77 +0,0 @@ |
163 | -# List of source files containing translatable strings. |
164 | -# Please keep this file sorted alphabetically. |
165 | -[encoding: UTF-8] |
166 | -applets/clock/calendar-client.c |
167 | -applets/clock/calendar-window.c |
168 | -applets/clock/clock.c |
169 | -applets/clock/clock-location.c |
170 | -applets/clock/clock-location-tile.c |
171 | -[type: gettext/glade]applets/clock/clock.ui |
172 | -applets/clock/clock-utils.c |
173 | -[type: gettext/ini]applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in |
174 | -applets/fish/fish.c |
175 | -[type: gettext/glade]applets/fish/fish.ui |
176 | -[type: gettext/ini]applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in |
177 | -applets/notification_area/main.c |
178 | -applets/notification_area/na-tray-manager.c |
179 | -[type: gettext/ini]applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in |
180 | -[type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in |
181 | -applets/wncklet/showdesktop.c |
182 | -applets/wncklet/window-list.c |
183 | -[type: gettext/glade]applets/wncklet/window-list.ui |
184 | -applets/wncklet/window-menu.c |
185 | -applets/wncklet/wncklet.c |
186 | -applets/wncklet/workspace-switcher.c |
187 | -[type: gettext/glade]applets/wncklet/workspace-switcher.ui |
188 | -data/gnome-fallback.desktop.in.in |
189 | -data/gnome-flashback.session.desktop.in |
190 | -data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in |
191 | -data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in |
192 | -data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in |
193 | -data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in |
194 | -data/org.gnome.gnome-panel.gschema.xml.in.in |
195 | -data/org.gnome.gnome-panel.launcher.gschema.xml.in.in |
196 | -data/org.gnome.gnome-panel.menu-button.gschema.xml.in.in |
197 | -data/org.gnome.gnome-panel.object.gschema.xml.in.in |
198 | -data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in |
199 | -gnome-panel/applet.c |
200 | -gnome-panel/button-widget.c |
201 | -gnome-panel/gnome-desktop-item-edit.c |
202 | -gnome-panel/gnome-panel.desktop.in.in |
203 | -gnome-panel/launcher.c |
204 | -gnome-panel/libegg/eggdesktopfile.c |
205 | -gnome-panel/libegg/eggsmclient.c |
206 | -gnome-panel/libpanel-util/panel-error.c |
207 | -gnome-panel/libpanel-util/panel-icon-chooser.c |
208 | -gnome-panel/libpanel-util/panel-launch.c |
209 | -gnome-panel/libpanel-util/panel-show.c |
210 | -gnome-panel/main.c |
211 | -gnome-panel/menu.c |
212 | -gnome-panel/panel-action-button.c |
213 | -gnome-panel/panel-addto.c |
214 | -gnome-panel/panel-applet-frame.c |
215 | -gnome-panel/panel-bindings.c |
216 | -gnome-panel/panel.c |
217 | -gnome-panel/panel-compatibility.c |
218 | -gnome-panel/panel-context-menu.c |
219 | -gnome-panel/panel-ditem-editor.c |
220 | -gnome-panel/panel-force-quit.c |
221 | -gnome-panel/panel-frame.c |
222 | -gnome-panel/panel-layout.c |
223 | -gnome-panel/panel-menu-bar.c |
224 | -gnome-panel/panel-menu-button.c |
225 | -gnome-panel/panel-menu-items.c |
226 | -gnome-panel/panel-properties-dialog.c |
227 | -[type: gettext/glade]gnome-panel/panel-properties-dialog.ui |
228 | -gnome-panel/panel-recent.c |
229 | -gnome-panel/panel-run-dialog.c |
230 | -[type: gettext/glade]gnome-panel/panel-run-dialog.ui |
231 | -gnome-panel/panel-separator.c |
232 | -gnome-panel/panel-shell.c |
233 | -gnome-panel/panel-stock-icons.c |
234 | -gnome-panel/panel-test-applets.c |
235 | -[type: gettext/glade]gnome-panel/panel-test-applets.ui |
236 | -gnome-panel/panel-toplevel.c |
237 | -gnome-panel/panel-util.c |
238 | -[type: gettext/ini]libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in |
239 | -libpanel-applet/panel-applet.c |
240 | |
241 | === removed directory '.pc/51_desktop_file.patch' |
242 | === removed directory '.pc/51_desktop_file.patch/gnome-panel' |
243 | === removed file '.pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in' |
244 | --- .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in 2014-04-13 12:27:07 +0000 |
245 | +++ .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in 1970-01-01 00:00:00 +0000 |
246 | @@ -1,18 +0,0 @@ |
247 | -[Desktop Entry] |
248 | -Type=Application |
249 | -_Name=Panel |
250 | -_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. |
251 | -Icon=gnome-panel |
252 | -Exec=gnome-panel |
253 | -StartupNotify=true |
254 | -Terminal=false |
255 | -X-GNOME-Bugzilla-Bugzilla=GNOME |
256 | -X-GNOME-Bugzilla-Product=gnome-panel |
257 | -X-GNOME-Bugzilla-Component=general |
258 | -X-GNOME-Bugzilla-Version=3.8.0 |
259 | -Categories=GNOME;GTK;System;Core; |
260 | -OnlyShowIn=GNOME; |
261 | -NoDisplay=true |
262 | -X-GNOME-AutoRestart=true |
263 | -X-GNOME-Autostart-Phase=Panel |
264 | -X-GNOME-Provides=panel |
265 | |
266 | === removed file '.pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in' |
267 | --- .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in 2014-04-13 12:27:07 +0000 |
268 | +++ .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in 1970-01-01 00:00:00 +0000 |
269 | @@ -1,18 +0,0 @@ |
270 | -[Desktop Entry] |
271 | -Type=Application |
272 | -_Name=Panel |
273 | -_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. |
274 | -Icon=gnome-panel |
275 | -Exec=gnome-panel |
276 | -StartupNotify=true |
277 | -Terminal=false |
278 | -X-GNOME-Bugzilla-Bugzilla=GNOME |
279 | -X-GNOME-Bugzilla-Product=gnome-panel |
280 | -X-GNOME-Bugzilla-Component=general |
281 | -X-GNOME-Bugzilla-Version=@VERSION@ |
282 | -Categories=GNOME;GTK;System;Core; |
283 | -OnlyShowIn=GNOME; |
284 | -NoDisplay=true |
285 | -X-GNOME-AutoRestart=true |
286 | -X-GNOME-Autostart-Phase=Panel |
287 | -X-GNOME-Provides=panel |
288 | |
289 | === modified file '.pc/applied-patches' |
290 | --- .pc/applied-patches 2014-04-13 12:27:07 +0000 |
291 | +++ .pc/applied-patches 2014-05-07 13:41:21 +0000 |
292 | @@ -9,7 +9,3 @@ |
293 | 11_compat_options.patch |
294 | fix-gweather-crash.patch |
295 | 40_unset_menuproxy.patch |
296 | -41_classic_layout.patch |
297 | -49_no_screensaver.patch |
298 | -50_ubuntu_sessions.patch |
299 | -51_desktop_file.patch |
300 | |
301 | === modified file 'data/Makefile.am' |
302 | --- data/Makefile.am 2013-11-22 10:20:12 +0000 |
303 | +++ data/Makefile.am 2014-05-07 13:41:21 +0000 |
304 | @@ -31,12 +31,12 @@ |
305 | @GSETTINGS_RULES@ |
306 | |
307 | sessiondir = $(datadir)/gnome-session/sessions |
308 | -session_in_files = gnome-flashback.session.desktop.in gnome-flashback-compiz.session.desktop.in |
309 | +session_in_files = gnome-flashback.session.desktop.in |
310 | session_DATA = $(session_in_files:.session.desktop.in=.session) |
311 | |
312 | xsessiondir = $(datadir)/xsessions |
313 | xsession_in_in_files = gnome-fallback.desktop.in.in |
314 | -xsession_in_files = gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in |
315 | +xsession_in_files = gnome-fallback.desktop.in |
316 | xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) |
317 | |
318 | %.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ |
319 | |
320 | === removed file 'data/gnome-fallback-compiz.desktop.in' |
321 | --- data/gnome-fallback-compiz.desktop.in 2014-03-01 14:39:38 +0000 |
322 | +++ data/gnome-fallback-compiz.desktop.in 1970-01-01 00:00:00 +0000 |
323 | @@ -1,8 +0,0 @@ |
324 | -[Desktop Entry] |
325 | -_Name=GNOME Flashback (Compiz) |
326 | -_Comment=This session logs you into GNOME with the traditional panel |
327 | -Exec=gnome-session --session=gnome-flashback-compiz |
328 | -TryExec=gnome-session |
329 | -Icon= |
330 | -Type=Application |
331 | -X-LightDM-DesktopName=Unity |
332 | |
333 | === modified file 'data/gnome-fallback.desktop.in.in' |
334 | --- data/gnome-fallback.desktop.in.in 2014-03-01 14:39:38 +0000 |
335 | +++ data/gnome-fallback.desktop.in.in 2014-05-07 13:41:21 +0000 |
336 | @@ -1,8 +1,7 @@ |
337 | [Desktop Entry] |
338 | -_Name=GNOME Flashback (Metacity) |
339 | +_Name=GNOME Flashback |
340 | _Comment=This session logs you into GNOME with the traditional panel |
341 | Exec=@libexecdir@/gnome-session-flashback |
342 | TryExec=@libexecdir@/gnome-session-flashback |
343 | Icon= |
344 | Type=Application |
345 | -X-LightDM-DesktopName=Unity |
346 | |
347 | === removed file 'data/gnome-flashback-compiz.session.desktop.in' |
348 | --- data/gnome-flashback-compiz.session.desktop.in 2014-03-01 14:39:38 +0000 |
349 | +++ data/gnome-flashback-compiz.session.desktop.in 1970-01-01 00:00:00 +0000 |
350 | @@ -1,4 +0,0 @@ |
351 | -[GNOME Session] |
352 | -_Name=GNOME Flashback (Compiz) |
353 | -RequiredComponents=gnome-panel;unity-settings-daemon;compiz;nautilus-classic;gnome-flashback-services; |
354 | -DesktopName=Unity |
355 | |
356 | === modified file 'data/gnome-flashback.session.desktop.in' |
357 | --- data/gnome-flashback.session.desktop.in 2014-03-01 14:39:38 +0000 |
358 | +++ data/gnome-flashback.session.desktop.in 2014-05-07 13:41:21 +0000 |
359 | @@ -1,4 +1,3 @@ |
360 | [GNOME Session] |
361 | -_Name=GNOME Flashback (Metacity) |
362 | -RequiredComponents=gnome-panel;unity-settings-daemon;metacity;nautilus-classic;gnome-flashback-services; |
363 | -DesktopName=Unity |
364 | +_Name=GNOME Flashback |
365 | +RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm; |
366 | |
367 | === modified file 'data/panel-default-layout.layout' |
368 | --- data/panel-default-layout.layout 2014-03-01 14:39:38 +0000 |
369 | +++ data/panel-default-layout.layout 2014-05-07 13:41:21 +0000 |
370 | @@ -14,21 +14,28 @@ |
371 | toplevel-id=top-panel |
372 | pack-index=0 |
373 | |
374 | -[Object indicators] |
375 | -object-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete |
376 | -toplevel-id=top-panel |
377 | -pack-type=end |
378 | -pack-index=0 |
379 | - |
380 | -[Object show-desktop] |
381 | -object-iid=WnckletFactory::ShowDesktopApplet |
382 | -toplevel-id=bottom-panel |
383 | +[Object clock] |
384 | +object-iid=ClockAppletFactory::ClockApplet |
385 | +toplevel-id=top-panel |
386 | +pack-type=end |
387 | +pack-index=1 |
388 | + |
389 | +[Object notification-area] |
390 | +object-iid=NotificationAreaAppletFactory::NotificationArea |
391 | +toplevel-id=top-panel |
392 | +pack-type=end |
393 | +pack-index=2 |
394 | + |
395 | +[Object user-menu] |
396 | +object-iid=PanelInternalFactory::UserMenu |
397 | +toplevel-id=top-panel |
398 | +pack-type=end |
399 | pack-index=0 |
400 | |
401 | [Object window-list] |
402 | object-iid=WnckletFactory::WindowListApplet |
403 | toplevel-id=bottom-panel |
404 | -pack-index=1 |
405 | +pack-index=0 |
406 | |
407 | [Object workspace-switcher] |
408 | object-iid=WnckletFactory::WorkspaceSwitcherApplet |
409 | |
410 | === modified file 'debian/changelog' |
411 | --- debian/changelog 2014-04-22 11:29:31 +0000 |
412 | +++ debian/changelog 2014-05-07 13:41:21 +0000 |
413 | @@ -1,3 +1,10 @@ |
414 | +gnome-panel (1:3.8.0-1ubuntu13) UNRELEASED; urgency=medium |
415 | + |
416 | + * Again update 40_unset_menuproxy.patch to restore menu proxy |
417 | + for applications launched from menu-bar and main-menu applets. |
418 | + |
419 | + -- Alberts Muktupāvels <alberts.muktupavels@gmail.com> Wed, 07 May 2014 14:18:13 +0300 |
420 | + |
421 | gnome-panel (1:3.8.0-1ubuntu12) trusty; urgency=medium |
422 | |
423 | * Update 40_unset_menuproxy.patch to unset menu proxy in |
424 | |
425 | === modified file 'debian/patches/40_unset_menuproxy.patch' |
426 | --- debian/patches/40_unset_menuproxy.patch 2014-04-22 11:29:31 +0000 |
427 | +++ debian/patches/40_unset_menuproxy.patch 2014-05-07 13:41:21 +0000 |
428 | @@ -5,8 +5,10 @@ |
429 | Forwarded: not-needed |
430 | Last-Update: 2014-04-22 |
431 | |
432 | ---- a/libpanel-applet/panel-applet.h |
433 | -+++ b/libpanel-applet/panel-applet.h |
434 | +Index: gnome-panel/libpanel-applet/panel-applet.h |
435 | +=================================================================== |
436 | +--- gnome-panel.orig/libpanel-applet/panel-applet.h 2014-05-07 14:13:37.938132777 +0300 |
437 | ++++ gnome-panel/libpanel-applet/panel-applet.h 2014-05-07 14:13:37.934132777 +0300 |
438 | @@ -236,6 +236,7 @@ |
439 | GError *error; \ |
440 | int retval; \ |
441 | @@ -15,8 +17,10 @@ |
442 | _PANEL_APPLET_SETUP_GETTEXT (TRUE); \ |
443 | \ |
444 | context = g_option_context_new (""); \ |
445 | ---- a/gnome-panel/main.c |
446 | -+++ b/gnome-panel/main.c |
447 | +Index: gnome-panel/gnome-panel/main.c |
448 | +=================================================================== |
449 | +--- gnome-panel.orig/gnome-panel/main.c 2014-05-07 14:13:37.938132777 +0300 |
450 | ++++ gnome-panel/gnome-panel/main.c 2014-05-07 14:13:37.934132777 +0300 |
451 | @@ -55,6 +55,8 @@ |
452 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
453 | textdomain (GETTEXT_PACKAGE); |
454 | @@ -26,3 +30,30 @@ |
455 | /* We will register explicitly when we're ready -- see panel-session.c */ |
456 | egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED); |
457 | |
458 | +Index: gnome-panel/gnome-panel/libpanel-util/panel-launch.c |
459 | +=================================================================== |
460 | +--- gnome-panel.orig/gnome-panel/libpanel-util/panel-launch.c 2014-05-07 14:12:48.506397000 +0300 |
461 | ++++ gnome-panel/gnome-panel/libpanel-util/panel-launch.c 2014-05-07 14:18:02.130125851 +0300 |
462 | +@@ -121,6 +121,8 @@ |
463 | + gdk_app_launch_context_set_screen (context, screen); |
464 | + gdk_app_launch_context_set_timestamp (context, timestamp); |
465 | + |
466 | ++ g_app_launch_context_setenv ((GAppLaunchContext *) context, "UBUNTU_MENUPROXY", "1"); |
467 | ++ |
468 | + local_error = NULL; |
469 | + g_desktop_app_info_launch_uris_as_manager ((GDesktopAppInfo*)appinfo, uris, |
470 | + (GAppLaunchContext *) context, |
471 | +@@ -263,9 +265,12 @@ |
472 | + |
473 | + display = gdk_screen_make_display_name (screen); |
474 | + |
475 | ++ char **envp = g_get_environ(); |
476 | ++ envp = g_environ_setenv(envp, "UBUNTU_MENUPROXY", "1", TRUE); |
477 | ++ |
478 | + g_spawn_async (NULL, /* working directory */ |
479 | + argv, |
480 | +- NULL, /* envp */ |
481 | ++ envp, /* envp */ |
482 | + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, |
483 | + set_environment, |
484 | + display, |
485 | |
486 | === modified file 'gnome-panel/gnome-panel.desktop.in' |
487 | --- gnome-panel/gnome-panel.desktop.in 2014-04-13 12:27:07 +0000 |
488 | +++ gnome-panel/gnome-panel.desktop.in 2014-05-07 13:41:21 +0000 |
489 | @@ -3,14 +3,15 @@ |
490 | _Name=Panel |
491 | _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. |
492 | Icon=gnome-panel |
493 | -Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel |
494 | +Exec=gnome-panel |
495 | +StartupNotify=true |
496 | Terminal=false |
497 | X-GNOME-Bugzilla-Bugzilla=GNOME |
498 | X-GNOME-Bugzilla-Product=gnome-panel |
499 | X-GNOME-Bugzilla-Component=general |
500 | X-GNOME-Bugzilla-Version=3.8.0 |
501 | Categories=GNOME;GTK;System;Core; |
502 | -OnlyShowIn=GNOME;Unity; |
503 | +OnlyShowIn=GNOME; |
504 | NoDisplay=true |
505 | X-GNOME-AutoRestart=true |
506 | X-GNOME-Autostart-Phase=Panel |
507 | |
508 | === modified file 'gnome-panel/gnome-panel.desktop.in.in' |
509 | --- gnome-panel/gnome-panel.desktop.in.in 2014-04-13 12:27:07 +0000 |
510 | +++ gnome-panel/gnome-panel.desktop.in.in 2014-05-07 13:41:21 +0000 |
511 | @@ -3,14 +3,15 @@ |
512 | _Name=Panel |
513 | _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. |
514 | Icon=gnome-panel |
515 | -Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel |
516 | +Exec=gnome-panel |
517 | +StartupNotify=true |
518 | Terminal=false |
519 | X-GNOME-Bugzilla-Bugzilla=GNOME |
520 | X-GNOME-Bugzilla-Product=gnome-panel |
521 | X-GNOME-Bugzilla-Component=general |
522 | X-GNOME-Bugzilla-Version=@VERSION@ |
523 | Categories=GNOME;GTK;System;Core; |
524 | -OnlyShowIn=GNOME;Unity; |
525 | +OnlyShowIn=GNOME; |
526 | NoDisplay=true |
527 | X-GNOME-AutoRestart=true |
528 | X-GNOME-Autostart-Phase=Panel |
529 | |
530 | === modified file 'gnome-panel/libpanel-util/panel-launch.c' |
531 | --- gnome-panel/libpanel-util/panel-launch.c 2013-11-22 10:20:12 +0000 |
532 | +++ gnome-panel/libpanel-util/panel-launch.c 2014-05-07 13:41:21 +0000 |
533 | @@ -121,6 +121,8 @@ |
534 | gdk_app_launch_context_set_screen (context, screen); |
535 | gdk_app_launch_context_set_timestamp (context, timestamp); |
536 | |
537 | + g_app_launch_context_setenv ((GAppLaunchContext *) context, "UBUNTU_MENUPROXY", "1"); |
538 | + |
539 | local_error = NULL; |
540 | g_desktop_app_info_launch_uris_as_manager ((GDesktopAppInfo*)appinfo, uris, |
541 | (GAppLaunchContext *) context, |
542 | @@ -263,9 +265,12 @@ |
543 | |
544 | display = gdk_screen_make_display_name (screen); |
545 | |
546 | + char **envp = g_get_environ(); |
547 | + envp = g_environ_setenv(envp, "UBUNTU_MENUPROXY", "1", TRUE); |
548 | + |
549 | g_spawn_async (NULL, /* working directory */ |
550 | argv, |
551 | - NULL, /* envp */ |
552 | + envp, /* envp */ |
553 | G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, |
554 | set_environment, |
555 | display, |
556 | |
557 | === modified file 'po/POTFILES.in' |
558 | --- po/POTFILES.in 2013-11-22 10:20:12 +0000 |
559 | +++ po/POTFILES.in 2014-05-07 13:41:21 +0000 |
560 | @@ -25,8 +25,6 @@ |
561 | [type: gettext/glade]applets/wncklet/workspace-switcher.ui |
562 | data/gnome-fallback.desktop.in.in |
563 | data/gnome-flashback.session.desktop.in |
564 | -data/gnome-fallback-compiz.desktop.in |
565 | -data/gnome-flashback-compiz.session.desktop.in |
566 | data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in |
567 | data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in |
568 | data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in |