GNOME Panel

Merge lp:~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339 into lp:ubuntu/trusty/gnome-panel

  1. fix-for-lp-1310929-and-lp-1222339
  2. Merge into trusty
Proposed by Alberts Muktupāvels
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339
Merge into: lp:ubuntu/trusty/gnome-panel
Diff against target: 532 lines (+56/-279)
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 (+19/-3)
gnome-panel/gnome-panel.desktop.in (+3/-2)
gnome-panel/gnome-panel.desktop.in.in (+3/-2)
gnome-panel/main.c (+2/-0)
po/POTFILES.in (+0/-2)
To merge this branch: bzr merge lp:~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Ubuntu branches Pending
Review via email: mp+216678@code.launchpad.net

Commit message

Update 40_unset_menuproxy.patch to unset menu proxy in gnome-panel too not only in applets.

Description of the change

Update 40_unset_menuproxy.patch to unset menu proxy in gnome-panel too not only in applets.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks a lot Alberts! Fixed the bug number in changelog, and uploaded into SRU review queue.

review: Approve
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Thanks a lot Alberts! Fixed the bug number in changelog, and uploaded into SRU
> review queue.

Bug reports was missing SRU information. I updated bug reports. Should I do something else to get upload accepted?

Can you upload fix for next ubuntu version?

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks for the SRU information. The upload is still in https://launchpad.net/ubuntu/trusty/+queue?queue_state=1, so we just have to wait.

I don't think I should upload it to Utopic, the archive is frozen for now, and the SRU should be copied from trusty-proposed to utopic-proposed when it's accepted.

Revision history for this message
Iain Lane (laney) wrote :

I copied this to utopic, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory '.pc/41_classic_layout.patch'
=== removed directory '.pc/41_classic_layout.patch/data'
=== removed file '.pc/41_classic_layout.patch/data/panel-default-layout.layout'
--- .pc/41_classic_layout.patch/data/panel-default-layout.layout 2013-11-22 10:20:12 +0000
+++ .pc/41_classic_layout.patch/data/panel-default-layout.layout 1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
1[Toplevel top-panel]
2expand=true
3orientation=top
4size=24
5
6[Toplevel bottom-panel]
7expand=true
8orientation=bottom
9size=24
10y-bottom=0
11
12[Object menu-bar]
13object-iid=PanelInternalFactory::MenuBar
14toplevel-id=top-panel
15pack-index=0
16
17[Object clock]
18object-iid=ClockAppletFactory::ClockApplet
19toplevel-id=top-panel
20pack-type=end
21pack-index=1
22
23[Object notification-area]
24object-iid=NotificationAreaAppletFactory::NotificationArea
25toplevel-id=top-panel
26pack-type=end
27pack-index=2
28
29[Object user-menu]
30object-iid=PanelInternalFactory::UserMenu
31toplevel-id=top-panel
32pack-type=end
33pack-index=0
34
35[Object window-list]
36object-iid=WnckletFactory::WindowListApplet
37toplevel-id=bottom-panel
38pack-index=0
39
40[Object workspace-switcher]
41object-iid=WnckletFactory::WorkspaceSwitcherApplet
42toplevel-id=bottom-panel
43pack-type=end
44pack-index=0
450
=== removed directory '.pc/49_no_screensaver.patch'
=== removed directory '.pc/49_no_screensaver.patch/data'
=== removed file '.pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in'
--- .pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in 2014-01-16 12:46:14 +0000
+++ .pc/49_no_screensaver.patch/data/gnome-flashback.session.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1[GNOME Session]
2_Name=GNOME Flashback
3RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;
40
=== removed directory '.pc/50_ubuntu_sessions.patch'
=== removed directory '.pc/50_ubuntu_sessions.patch/data'
=== removed file '.pc/50_ubuntu_sessions.patch/data/Makefile.am'
--- .pc/50_ubuntu_sessions.patch/data/Makefile.am 2013-11-22 10:20:12 +0000
+++ .pc/50_ubuntu_sessions.patch/data/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
1SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
2
3gsettings_applets_schemas_in_in = \
4 org.gnome.gnome-panel.applet.fish.gschema.xml.in.in \
5 org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in \
6 org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in \
7 org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
8
9gsettings_panel_schemas_in_in = \
10 org.gnome.gnome-panel.gschema.xml.in.in \
11 org.gnome.gnome-panel.launcher.gschema.xml.in.in \
12 org.gnome.gnome-panel.menu-button.gschema.xml.in.in \
13 org.gnome.gnome-panel.object.gschema.xml.in.in \
14 org.gnome.gnome-panel.toplevel.gschema.xml.in.in
15
16gsettings_schemas_in_in = \
17 $(gsettings_panel_schemas_in_in) \
18 $(gsettings_applets_schemas_in_in)
19
20@INTLTOOL_XML_NOMERGE_RULE@
21
22gsettings_ENUM_NAMESPACE = org.gnome.gnome-panel
23gsettings_ENUM_FILES = $(top_srcdir)/gnome-panel/panel-enums-gsettings.h
24
25gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
26gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
27
28%.gschema.xml.in: %.gschema.xml.in.in Makefile
29 $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
30
31@GSETTINGS_RULES@
32
33sessiondir = $(datadir)/gnome-session/sessions
34session_in_files = gnome-flashback.session.desktop.in
35session_DATA = $(session_in_files:.session.desktop.in=.session)
36
37xsessiondir = $(datadir)/xsessions
38xsession_in_in_files = gnome-fallback.desktop.in.in
39xsession_in_files = gnome-fallback.desktop.in
40xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
41
42%.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 $< $@
43
44%.desktop.in: %.desktop.in.in
45 $(AM_V_GEN)sed -e 's,[@]libexecdir[@],$(libexecdir),g' <$< >$@
46
47@INTLTOOL_DESKTOP_RULE@
48
49default_layoutdir = $(datadir)/gnome-panel
50default_layout_DATA = panel-default-layout.layout
51
52EXTRA_DIST = \
53 $(gsettings_schemas_in_in) \
54 $(session_in_files) \
55 $(xsession_in_in_files) \
56 $(default_layout_DATA)
57
58CLEANFILES = \
59 $(gsettings__enum_file) \
60 $(gsettings_SCHEMAS_in) \
61 $(gsettings_SCHEMAS) \
62 *.gschema.valid \
63 $(session_DATA) \
64 $(xsession_DATA) \
65 $(xsession_in_files)
66
67-include $(top_srcdir)/git.mk
680
=== removed file '.pc/50_ubuntu_sessions.patch/data/gnome-fallback-compiz.desktop.in'
=== removed file '.pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in'
--- .pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in 2013-11-22 10:20:12 +0000
+++ .pc/50_ubuntu_sessions.patch/data/gnome-fallback.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1[Desktop Entry]
2_Name=GNOME Flashback
3_Comment=This session logs you into GNOME with the traditional panel
4Exec=@libexecdir@/gnome-session-flashback
5TryExec=@libexecdir@/gnome-session-flashback
6Icon=
7Type=Application
80
=== removed file '.pc/50_ubuntu_sessions.patch/data/gnome-flashback-compiz.session.desktop.in'
=== removed file '.pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in'
--- .pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in 2014-01-16 12:46:14 +0000
+++ .pc/50_ubuntu_sessions.patch/data/gnome-flashback.session.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1[GNOME Session]
2_Name=GNOME Flashback
3RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-wm;
40
=== removed directory '.pc/50_ubuntu_sessions.patch/po'
=== removed file '.pc/50_ubuntu_sessions.patch/po/POTFILES.in'
--- .pc/50_ubuntu_sessions.patch/po/POTFILES.in 2013-11-22 10:20:12 +0000
+++ .pc/50_ubuntu_sessions.patch/po/POTFILES.in 1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
1# List of source files containing translatable strings.
2# Please keep this file sorted alphabetically.
3[encoding: UTF-8]
4applets/clock/calendar-client.c
5applets/clock/calendar-window.c
6applets/clock/clock.c
7applets/clock/clock-location.c
8applets/clock/clock-location-tile.c
9[type: gettext/glade]applets/clock/clock.ui
10applets/clock/clock-utils.c
11[type: gettext/ini]applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
12applets/fish/fish.c
13[type: gettext/glade]applets/fish/fish.ui
14[type: gettext/ini]applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
15applets/notification_area/main.c
16applets/notification_area/na-tray-manager.c
17[type: gettext/ini]applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
18[type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
19applets/wncklet/showdesktop.c
20applets/wncklet/window-list.c
21[type: gettext/glade]applets/wncklet/window-list.ui
22applets/wncklet/window-menu.c
23applets/wncklet/wncklet.c
24applets/wncklet/workspace-switcher.c
25[type: gettext/glade]applets/wncklet/workspace-switcher.ui
26data/gnome-fallback.desktop.in.in
27data/gnome-flashback.session.desktop.in
28data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
29data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
30data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
31data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in
32data/org.gnome.gnome-panel.gschema.xml.in.in
33data/org.gnome.gnome-panel.launcher.gschema.xml.in.in
34data/org.gnome.gnome-panel.menu-button.gschema.xml.in.in
35data/org.gnome.gnome-panel.object.gschema.xml.in.in
36data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
37gnome-panel/applet.c
38gnome-panel/button-widget.c
39gnome-panel/gnome-desktop-item-edit.c
40gnome-panel/gnome-panel.desktop.in.in
41gnome-panel/launcher.c
42gnome-panel/libegg/eggdesktopfile.c
43gnome-panel/libegg/eggsmclient.c
44gnome-panel/libpanel-util/panel-error.c
45gnome-panel/libpanel-util/panel-icon-chooser.c
46gnome-panel/libpanel-util/panel-launch.c
47gnome-panel/libpanel-util/panel-show.c
48gnome-panel/main.c
49gnome-panel/menu.c
50gnome-panel/panel-action-button.c
51gnome-panel/panel-addto.c
52gnome-panel/panel-applet-frame.c
53gnome-panel/panel-bindings.c
54gnome-panel/panel.c
55gnome-panel/panel-compatibility.c
56gnome-panel/panel-context-menu.c
57gnome-panel/panel-ditem-editor.c
58gnome-panel/panel-force-quit.c
59gnome-panel/panel-frame.c
60gnome-panel/panel-layout.c
61gnome-panel/panel-menu-bar.c
62gnome-panel/panel-menu-button.c
63gnome-panel/panel-menu-items.c
64gnome-panel/panel-properties-dialog.c
65[type: gettext/glade]gnome-panel/panel-properties-dialog.ui
66gnome-panel/panel-recent.c
67gnome-panel/panel-run-dialog.c
68[type: gettext/glade]gnome-panel/panel-run-dialog.ui
69gnome-panel/panel-separator.c
70gnome-panel/panel-shell.c
71gnome-panel/panel-stock-icons.c
72gnome-panel/panel-test-applets.c
73[type: gettext/glade]gnome-panel/panel-test-applets.ui
74gnome-panel/panel-toplevel.c
75gnome-panel/panel-util.c
76[type: gettext/ini]libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
77libpanel-applet/panel-applet.c
780
=== removed directory '.pc/51_desktop_file.patch'
=== removed directory '.pc/51_desktop_file.patch/gnome-panel'
=== removed file '.pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in'
--- .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in 2014-04-13 12:27:07 +0000
+++ .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1[Desktop Entry]
2Type=Application
3_Name=Panel
4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
5Icon=gnome-panel
6Exec=gnome-panel
7StartupNotify=true
8Terminal=false
9X-GNOME-Bugzilla-Bugzilla=GNOME
10X-GNOME-Bugzilla-Product=gnome-panel
11X-GNOME-Bugzilla-Component=general
12X-GNOME-Bugzilla-Version=3.8.0
13Categories=GNOME;GTK;System;Core;
14OnlyShowIn=GNOME;
15NoDisplay=true
16X-GNOME-AutoRestart=true
17X-GNOME-Autostart-Phase=Panel
18X-GNOME-Provides=panel
190
=== removed file '.pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in'
--- .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in 2014-04-13 12:27:07 +0000
+++ .pc/51_desktop_file.patch/gnome-panel/gnome-panel.desktop.in.in 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
1[Desktop Entry]
2Type=Application
3_Name=Panel
4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
5Icon=gnome-panel
6Exec=gnome-panel
7StartupNotify=true
8Terminal=false
9X-GNOME-Bugzilla-Bugzilla=GNOME
10X-GNOME-Bugzilla-Product=gnome-panel
11X-GNOME-Bugzilla-Component=general
12X-GNOME-Bugzilla-Version=@VERSION@
13Categories=GNOME;GTK;System;Core;
14OnlyShowIn=GNOME;
15NoDisplay=true
16X-GNOME-AutoRestart=true
17X-GNOME-Autostart-Phase=Panel
18X-GNOME-Provides=panel
190
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2014-04-13 12:27:07 +0000
+++ .pc/applied-patches 2014-04-22 09:00:45 +0000
@@ -9,7 +9,3 @@
911_compat_options.patch911_compat_options.patch
10fix-gweather-crash.patch10fix-gweather-crash.patch
1140_unset_menuproxy.patch1140_unset_menuproxy.patch
1241_classic_layout.patch
1349_no_screensaver.patch
1450_ubuntu_sessions.patch
1551_desktop_file.patch
1612
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2013-11-22 10:20:12 +0000
+++ data/Makefile.am 2014-04-22 09:00:45 +0000
@@ -31,12 +31,12 @@
31@GSETTINGS_RULES@31@GSETTINGS_RULES@
3232
33sessiondir = $(datadir)/gnome-session/sessions33sessiondir = $(datadir)/gnome-session/sessions
34session_in_files = gnome-flashback.session.desktop.in gnome-flashback-compiz.session.desktop.in34session_in_files = gnome-flashback.session.desktop.in
35session_DATA = $(session_in_files:.session.desktop.in=.session)35session_DATA = $(session_in_files:.session.desktop.in=.session)
3636
37xsessiondir = $(datadir)/xsessions37xsessiondir = $(datadir)/xsessions
38xsession_in_in_files = gnome-fallback.desktop.in.in38xsession_in_in_files = gnome-fallback.desktop.in.in
39xsession_in_files = gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in39xsession_in_files = gnome-fallback.desktop.in
40xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)40xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
4141
42%.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 $< $@42%.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 $< $@
4343
=== removed file 'data/gnome-fallback-compiz.desktop.in'
--- data/gnome-fallback-compiz.desktop.in 2014-03-01 14:39:38 +0000
+++ data/gnome-fallback-compiz.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1[Desktop Entry]
2_Name=GNOME Flashback (Compiz)
3_Comment=This session logs you into GNOME with the traditional panel
4Exec=gnome-session --session=gnome-flashback-compiz
5TryExec=gnome-session
6Icon=
7Type=Application
8X-LightDM-DesktopName=Unity
90
=== modified file 'data/gnome-fallback.desktop.in.in'
--- data/gnome-fallback.desktop.in.in 2014-03-01 14:39:38 +0000
+++ data/gnome-fallback.desktop.in.in 2014-04-22 09:00:45 +0000
@@ -1,8 +1,7 @@
1[Desktop Entry]1[Desktop Entry]
2_Name=GNOME Flashback (Metacity)2_Name=GNOME Flashback
3_Comment=This session logs you into GNOME with the traditional panel3_Comment=This session logs you into GNOME with the traditional panel
4Exec=@libexecdir@/gnome-session-flashback4Exec=@libexecdir@/gnome-session-flashback
5TryExec=@libexecdir@/gnome-session-flashback5TryExec=@libexecdir@/gnome-session-flashback
6Icon=6Icon=
7Type=Application7Type=Application
8X-LightDM-DesktopName=Unity
98
=== removed file 'data/gnome-flashback-compiz.session.desktop.in'
--- data/gnome-flashback-compiz.session.desktop.in 2014-03-01 14:39:38 +0000
+++ data/gnome-flashback-compiz.session.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1[GNOME Session]
2_Name=GNOME Flashback (Compiz)
3RequiredComponents=gnome-panel;unity-settings-daemon;compiz;nautilus-classic;gnome-flashback-services;
4DesktopName=Unity
50
=== modified file 'data/gnome-flashback.session.desktop.in'
--- data/gnome-flashback.session.desktop.in 2014-03-01 14:39:38 +0000
+++ data/gnome-flashback.session.desktop.in 2014-04-22 09:00:45 +0000
@@ -1,4 +1,3 @@
1[GNOME Session]1[GNOME Session]
2_Name=GNOME Flashback (Metacity)2_Name=GNOME Flashback
3RequiredComponents=gnome-panel;unity-settings-daemon;metacity;nautilus-classic;gnome-flashback-services;3RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;
4DesktopName=Unity
54
=== modified file 'data/panel-default-layout.layout'
--- data/panel-default-layout.layout 2014-03-01 14:39:38 +0000
+++ data/panel-default-layout.layout 2014-04-22 09:00:45 +0000
@@ -14,21 +14,28 @@
14toplevel-id=top-panel14toplevel-id=top-panel
15pack-index=015pack-index=0
1616
17[Object indicators]17[Object clock]
18object-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete18object-iid=ClockAppletFactory::ClockApplet
19toplevel-id=top-panel19toplevel-id=top-panel
20pack-type=end20pack-type=end
21pack-index=021pack-index=1
2222
23[Object show-desktop]23[Object notification-area]
24object-iid=WnckletFactory::ShowDesktopApplet24object-iid=NotificationAreaAppletFactory::NotificationArea
25toplevel-id=bottom-panel25toplevel-id=top-panel
26pack-type=end
27pack-index=2
28
29[Object user-menu]
30object-iid=PanelInternalFactory::UserMenu
31toplevel-id=top-panel
32pack-type=end
26pack-index=033pack-index=0
2734
28[Object window-list]35[Object window-list]
29object-iid=WnckletFactory::WindowListApplet36object-iid=WnckletFactory::WindowListApplet
30toplevel-id=bottom-panel37toplevel-id=bottom-panel
31pack-index=138pack-index=0
3239
33[Object workspace-switcher]40[Object workspace-switcher]
34object-iid=WnckletFactory::WorkspaceSwitcherApplet41object-iid=WnckletFactory::WorkspaceSwitcherApplet
3542
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-13 12:27:07 +0000
+++ debian/changelog 2014-04-22 09:00:45 +0000
@@ -1,3 +1,10 @@
1gnome-panel (1:3.8.0-1ubuntu12) UNRELEASED; urgency=medium
2
3 * Update 40_unset_menuproxy.patch to unset menu proxy in
4 gnome-panel too not only in applets (lp: #1310929, #122339).
5
6 -- Alberts Muktupāvels <alberts.muktupavels@gmail.com> Tue, 22 Apr 2014 11:29:31 +0300
7
1gnome-panel (1:3.8.0-1ubuntu11) trusty; urgency=medium8gnome-panel (1:3.8.0-1ubuntu11) trusty; urgency=medium
29
3 * Set XDG_MENU_PREFIX to "gnome-flashback-" in the desktop file10 * Set XDG_MENU_PREFIX to "gnome-flashback-" in the desktop file
411
=== modified file 'debian/patches/40_unset_menuproxy.patch'
--- debian/patches/40_unset_menuproxy.patch 2014-02-19 17:16:13 +0000
+++ debian/patches/40_unset_menuproxy.patch 2014-04-22 09:00:45 +0000
@@ -1,11 +1,14 @@
1Description: make sure gnome-panel and the applets don't pick up menu proxies1Description: make sure gnome-panel and the applets don't pick up menu proxies
2Author: Ted Gould <ted@ubuntu.com>2Author: Ted Gould <ted@ubuntu.com>
3Author: Dmitry Shachnev <mitya57@ubuntu.com>3Author: Dmitry Shachnev <mitya57@ubuntu.com>
4Author: Alberts Muktupavels <alberts.muktupavels@gmail.com>
4Forwarded: not-needed5Forwarded: not-needed
5Last-Update: 2014-02-196Last-Update: 2014-04-22
67
7--- a/libpanel-applet/panel-applet.h8Index: lp1310929/libpanel-applet/panel-applet.h
8+++ b/libpanel-applet/panel-applet.h9===================================================================
10--- lp1310929.orig/libpanel-applet/panel-applet.h 2014-04-22 11:26:52.800524438 +0300
11+++ lp1310929/libpanel-applet/panel-applet.h 2014-04-22 11:26:52.792524438 +0300
9@@ -236,6 +236,7 @@12@@ -236,6 +236,7 @@
10 GError *error; \13 GError *error; \
11 int retval; \14 int retval; \
@@ -14,3 +17,16 @@
14 _PANEL_APPLET_SETUP_GETTEXT (TRUE); \17 _PANEL_APPLET_SETUP_GETTEXT (TRUE); \
15 \18 \
16 context = g_option_context_new (""); \19 context = g_option_context_new (""); \
20Index: lp1310929/gnome-panel/main.c
21===================================================================
22--- lp1310929.orig/gnome-panel/main.c 2014-04-22 11:26:52.720524440 +0300
23+++ lp1310929/gnome-panel/main.c 2014-04-22 11:28:17.508522217 +0300
24@@ -55,6 +55,8 @@
25 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
26 textdomain (GETTEXT_PACKAGE);
27
28+ g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
29+
30 /* We will register explicitly when we're ready -- see panel-session.c */
31 egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
32
1733
=== modified file 'gnome-panel/gnome-panel.desktop.in'
--- gnome-panel/gnome-panel.desktop.in 2014-04-13 12:27:07 +0000
+++ gnome-panel/gnome-panel.desktop.in 2014-04-22 09:00:45 +0000
@@ -3,14 +3,15 @@
3_Name=Panel3_Name=Panel
4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
5Icon=gnome-panel5Icon=gnome-panel
6Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel6Exec=gnome-panel
7StartupNotify=true
7Terminal=false8Terminal=false
8X-GNOME-Bugzilla-Bugzilla=GNOME9X-GNOME-Bugzilla-Bugzilla=GNOME
9X-GNOME-Bugzilla-Product=gnome-panel10X-GNOME-Bugzilla-Product=gnome-panel
10X-GNOME-Bugzilla-Component=general11X-GNOME-Bugzilla-Component=general
11X-GNOME-Bugzilla-Version=3.8.012X-GNOME-Bugzilla-Version=3.8.0
12Categories=GNOME;GTK;System;Core;13Categories=GNOME;GTK;System;Core;
13OnlyShowIn=GNOME;Unity;14OnlyShowIn=GNOME;
14NoDisplay=true15NoDisplay=true
15X-GNOME-AutoRestart=true16X-GNOME-AutoRestart=true
16X-GNOME-Autostart-Phase=Panel17X-GNOME-Autostart-Phase=Panel
1718
=== modified file 'gnome-panel/gnome-panel.desktop.in.in'
--- gnome-panel/gnome-panel.desktop.in.in 2014-04-13 12:27:07 +0000
+++ gnome-panel/gnome-panel.desktop.in.in 2014-04-22 09:00:45 +0000
@@ -3,14 +3,15 @@
3_Name=Panel3_Name=Panel
4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.4_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
5Icon=gnome-panel5Icon=gnome-panel
6Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel6Exec=gnome-panel
7StartupNotify=true
7Terminal=false8Terminal=false
8X-GNOME-Bugzilla-Bugzilla=GNOME9X-GNOME-Bugzilla-Bugzilla=GNOME
9X-GNOME-Bugzilla-Product=gnome-panel10X-GNOME-Bugzilla-Product=gnome-panel
10X-GNOME-Bugzilla-Component=general11X-GNOME-Bugzilla-Component=general
11X-GNOME-Bugzilla-Version=@VERSION@12X-GNOME-Bugzilla-Version=@VERSION@
12Categories=GNOME;GTK;System;Core;13Categories=GNOME;GTK;System;Core;
13OnlyShowIn=GNOME;Unity;14OnlyShowIn=GNOME;
14NoDisplay=true15NoDisplay=true
15X-GNOME-AutoRestart=true16X-GNOME-AutoRestart=true
16X-GNOME-Autostart-Phase=Panel17X-GNOME-Autostart-Phase=Panel
1718
=== modified file 'gnome-panel/main.c'
--- gnome-panel/main.c 2012-05-25 10:44:35 +0000
+++ gnome-panel/main.c 2014-04-22 09:00:45 +0000
@@ -55,6 +55,8 @@
55 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");55 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
56 textdomain (GETTEXT_PACKAGE);56 textdomain (GETTEXT_PACKAGE);
5757
58 g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
59
58 /* We will register explicitly when we're ready -- see panel-session.c */60 /* We will register explicitly when we're ready -- see panel-session.c */
59 egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);61 egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
6062
6163
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2013-11-22 10:20:12 +0000
+++ po/POTFILES.in 2014-04-22 09:00:45 +0000
@@ -25,8 +25,6 @@
25[type: gettext/glade]applets/wncklet/workspace-switcher.ui25[type: gettext/glade]applets/wncklet/workspace-switcher.ui
26data/gnome-fallback.desktop.in.in26data/gnome-fallback.desktop.in.in
27data/gnome-flashback.session.desktop.in27data/gnome-flashback.session.desktop.in
28data/gnome-fallback-compiz.desktop.in
29data/gnome-flashback-compiz.session.desktop.in
30data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in28data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
31data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in29data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
32data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in30data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in

Subscribers

People subscribed via source and target branches