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

[Alberts Muktupāvels]

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

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

[Dmitry Shachnev (mitya57)]

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

review: Approve

[Alberts Muktupāvels (muktupavels)]

> 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?

[Dmitry Shachnev (mitya57)]

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.

[Iain Lane (laney)]

I copied this to utopic, thanks.

=== 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 @@
-[Toplevel top-panel]
-expand=true
-orientation=top
-size=24
-
-[Toplevel bottom-panel]
-expand=true
-orientation=bottom
-size=24
-y-bottom=0
-
-[Object menu-bar]
-object-iid=PanelInternalFactory::MenuBar
-toplevel-id=top-panel
-pack-index=0
-
-[Object clock]
-object-iid=ClockAppletFactory::ClockApplet
-toplevel-id=top-panel
-pack-type=end
-pack-index=1
-
-[Object notification-area]
-object-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=top-panel
-pack-type=end
-pack-index=2
-
-[Object user-menu]
-object-iid=PanelInternalFactory::UserMenu
-toplevel-id=top-panel
-pack-type=end
-pack-index=0
-
-[Object window-list]
-object-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom-panel
-pack-index=0
-
-[Object workspace-switcher]
-object-iid=WnckletFactory::WorkspaceSwitcherApplet
-toplevel-id=bottom-panel
-pack-type=end
-pack-index=0

=== 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 @@
-[GNOME Session]
-_Name=GNOME Flashback
-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;

=== 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 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
-
-gsettings_applets_schemas_in_in =						\
-	org.gnome.gnome-panel.applet.fish.gschema.xml.in.in			\
-	org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in		\
-	org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in 	\
-	org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
-
-gsettings_panel_schemas_in_in =					\
-	org.gnome.gnome-panel.gschema.xml.in.in			\
-	org.gnome.gnome-panel.launcher.gschema.xml.in.in	\
-	org.gnome.gnome-panel.menu-button.gschema.xml.in.in	\
-	org.gnome.gnome-panel.object.gschema.xml.in.in		\
-	org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-
-gsettings_schemas_in_in =			\
-	$(gsettings_panel_schemas_in_in)	\
-	$(gsettings_applets_schemas_in_in)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_ENUM_NAMESPACE = org.gnome.gnome-panel
-gsettings_ENUM_FILES = $(top_srcdir)/gnome-panel/panel-enums-gsettings.h
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
-gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
-@GSETTINGS_RULES@
-
-sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-flashback.session.desktop.in
-session_DATA = $(session_in_files:.session.desktop.in=.session)
-
-xsessiondir = $(datadir)/xsessions
-xsession_in_in_files = gnome-fallback.desktop.in.in
-xsession_in_files = gnome-fallback.desktop.in
-xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
-%.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 $< $@
-
-%.desktop.in: %.desktop.in.in
-	$(AM_V_GEN)sed -e 's,[@]libexecdir[@],$(libexecdir),g' <$< >$@
-
-@INTLTOOL_DESKTOP_RULE@
-
-default_layoutdir   = $(datadir)/gnome-panel
-default_layout_DATA = panel-default-layout.layout
-
-EXTRA_DIST =				\
-	$(gsettings_schemas_in_in)	\
-	$(session_in_files)		\
-	$(xsession_in_in_files)		\
-	$(default_layout_DATA)
-
-CLEANFILES =			\
-	$(gsettings__enum_file)	\
-	$(gsettings_SCHEMAS_in)	\
-	$(gsettings_SCHEMAS)	\
-	*.gschema.valid		\
-	$(session_DATA)		\
-	$(xsession_DATA)	\
-	$(xsession_in_files)
-
--include $(top_srcdir)/git.mk

=== 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 @@
-[Desktop Entry]
-_Name=GNOME Flashback
-_Comment=This session logs you into GNOME with the traditional panel
-Exec=@libexecdir@/gnome-session-flashback
-TryExec=@libexecdir@/gnome-session-flashback
-Icon=
-Type=Application

=== 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 @@
-[GNOME Session]
-_Name=GNOME Flashback
-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-wm;

=== 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 @@
-# List of source files containing translatable strings.
-# Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-applets/clock/calendar-client.c
-applets/clock/calendar-window.c
-applets/clock/clock.c
-applets/clock/clock-location.c
-applets/clock/clock-location-tile.c
-[type: gettext/glade]applets/clock/clock.ui
-applets/clock/clock-utils.c
-[type: gettext/ini]applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
-applets/fish/fish.c
-[type: gettext/glade]applets/fish/fish.ui
-[type: gettext/ini]applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
-applets/notification_area/main.c
-applets/notification_area/na-tray-manager.c
-[type: gettext/ini]applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
-[type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
-applets/wncklet/showdesktop.c
-applets/wncklet/window-list.c
-[type: gettext/glade]applets/wncklet/window-list.ui
-applets/wncklet/window-menu.c
-applets/wncklet/wncklet.c
-applets/wncklet/workspace-switcher.c
-[type: gettext/glade]applets/wncklet/workspace-switcher.ui
-data/gnome-fallback.desktop.in.in
-data/gnome-flashback.session.desktop.in
-data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in
-data/org.gnome.gnome-panel.gschema.xml.in.in
-data/org.gnome.gnome-panel.launcher.gschema.xml.in.in
-data/org.gnome.gnome-panel.menu-button.gschema.xml.in.in
-data/org.gnome.gnome-panel.object.gschema.xml.in.in
-data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-gnome-panel/applet.c
-gnome-panel/button-widget.c
-gnome-panel/gnome-desktop-item-edit.c
-gnome-panel/gnome-panel.desktop.in.in
-gnome-panel/launcher.c
-gnome-panel/libegg/eggdesktopfile.c
-gnome-panel/libegg/eggsmclient.c
-gnome-panel/libpanel-util/panel-error.c
-gnome-panel/libpanel-util/panel-icon-chooser.c
-gnome-panel/libpanel-util/panel-launch.c
-gnome-panel/libpanel-util/panel-show.c
-gnome-panel/main.c
-gnome-panel/menu.c
-gnome-panel/panel-action-button.c
-gnome-panel/panel-addto.c
-gnome-panel/panel-applet-frame.c
-gnome-panel/panel-bindings.c
-gnome-panel/panel.c
-gnome-panel/panel-compatibility.c
-gnome-panel/panel-context-menu.c
-gnome-panel/panel-ditem-editor.c
-gnome-panel/panel-force-quit.c
-gnome-panel/panel-frame.c
-gnome-panel/panel-layout.c
-gnome-panel/panel-menu-bar.c
-gnome-panel/panel-menu-button.c
-gnome-panel/panel-menu-items.c
-gnome-panel/panel-properties-dialog.c
-[type: gettext/glade]gnome-panel/panel-properties-dialog.ui
-gnome-panel/panel-recent.c
-gnome-panel/panel-run-dialog.c
-[type: gettext/glade]gnome-panel/panel-run-dialog.ui
-gnome-panel/panel-separator.c
-gnome-panel/panel-shell.c
-gnome-panel/panel-stock-icons.c
-gnome-panel/panel-test-applets.c
-[type: gettext/glade]gnome-panel/panel-test-applets.ui
-gnome-panel/panel-toplevel.c
-gnome-panel/panel-util.c
-[type: gettext/ini]libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
-libpanel-applet/panel-applet.c

=== 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 @@
-[Desktop Entry]
-Type=Application
-_Name=Panel
-_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
-Icon=gnome-panel
-Exec=gnome-panel
-StartupNotify=true
-Terminal=false
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-panel
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.8.0
-Categories=GNOME;GTK;System;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-AutoRestart=true
-X-GNOME-Autostart-Phase=Panel
-X-GNOME-Provides=panel

=== 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 @@
-[Desktop Entry]
-Type=Application
-_Name=Panel
-_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
-Icon=gnome-panel
-Exec=gnome-panel
-StartupNotify=true
-Terminal=false
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-panel
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;System;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-AutoRestart=true
-X-GNOME-Autostart-Phase=Panel
-X-GNOME-Provides=panel

=== 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 @@
 11_compat_options.patch
 fix-gweather-crash.patch
 40_unset_menuproxy.patch
-41_classic_layout.patch
-49_no_screensaver.patch
-50_ubuntu_sessions.patch
-51_desktop_file.patch

=== 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 @@
 @GSETTINGS_RULES@
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-flashback.session.desktop.in gnome-flashback-compiz.session.desktop.in
+session_in_files = gnome-flashback.session.desktop.in
 session_DATA = $(session_in_files:.session.desktop.in=.session)
 
 xsessiondir = $(datadir)/xsessions
 xsession_in_in_files = gnome-fallback.desktop.in.in
-xsession_in_files = gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in
+xsession_in_files = gnome-fallback.desktop.in
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
 %.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 $< $@

=== 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 @@
-[Desktop Entry]
-_Name=GNOME Flashback (Compiz)
-_Comment=This session logs you into GNOME with the traditional panel
-Exec=gnome-session --session=gnome-flashback-compiz
-TryExec=gnome-session
-Icon=
-Type=Application
-X-LightDM-DesktopName=Unity

=== 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 @@
 [Desktop Entry]
-_Name=GNOME Flashback (Metacity)
+_Name=GNOME Flashback
 _Comment=This session logs you into GNOME with the traditional panel
 Exec=@libexecdir@/gnome-session-flashback
 TryExec=@libexecdir@/gnome-session-flashback
 Icon=
 Type=Application
-X-LightDM-DesktopName=Unity

=== 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 @@
-[GNOME Session]
-_Name=GNOME Flashback (Compiz)
-RequiredComponents=gnome-panel;unity-settings-daemon;compiz;nautilus-classic;gnome-flashback-services;
-DesktopName=Unity

=== 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 @@
 [GNOME Session]
-_Name=GNOME Flashback (Metacity)
-RequiredComponents=gnome-panel;unity-settings-daemon;metacity;nautilus-classic;gnome-flashback-services;
-DesktopName=Unity
+_Name=GNOME Flashback
+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;gnome-wm;

=== 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 @@
 toplevel-id=top-panel
 pack-index=0
 
-[Object indicators]
-object-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
-toplevel-id=top-panel
-pack-type=end
-pack-index=0
-
-[Object show-desktop]
-object-iid=WnckletFactory::ShowDesktopApplet
-toplevel-id=bottom-panel
+[Object clock]
+object-iid=ClockAppletFactory::ClockApplet
+toplevel-id=top-panel
+pack-type=end
+pack-index=1
+
+[Object notification-area]
+object-iid=NotificationAreaAppletFactory::NotificationArea
+toplevel-id=top-panel
+pack-type=end
+pack-index=2
+
+[Object user-menu]
+object-iid=PanelInternalFactory::UserMenu
+toplevel-id=top-panel
+pack-type=end
 pack-index=0
 
 [Object window-list]
 object-iid=WnckletFactory::WindowListApplet
 toplevel-id=bottom-panel
-pack-index=1
+pack-index=0
 
 [Object workspace-switcher]
 object-iid=WnckletFactory::WorkspaceSwitcherApplet

=== 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 @@
+gnome-panel (1:3.8.0-1ubuntu12) UNRELEASED; urgency=medium
+
+  * Update 40_unset_menuproxy.patch to unset menu proxy in
+    gnome-panel too not only in applets (lp: #1310929, #122339).
+
+ -- Alberts Muktupāvels <[e-mail]>  Tue, 22 Apr 2014 11:29:31 +0300
+
 gnome-panel (1:3.8.0-1ubuntu11) trusty; urgency=medium
 
   * Set XDG_MENU_PREFIX to "gnome-flashback-" in the desktop file

=== 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 @@
 Description: make sure gnome-panel and the applets don't pick up menu proxies
 Author: Ted Gould <[e-mail]>
 Author: Dmitry Shachnev <[e-mail]>
+Author: Alberts Muktupavels <[e-mail]>
 Forwarded: not-needed
-Last-Update: 2014-02-19
+Last-Update: 2014-04-22
 
---- a/libpanel-applet/panel-applet.h
-+++ b/libpanel-applet/panel-applet.h
+Index: lp1310929/libpanel-applet/panel-applet.h
+===================================================================
+--- lp1310929.orig/libpanel-applet/panel-applet.h	2014-04-22 11:26:52.800524438 +0300
++++ lp1310929/libpanel-applet/panel-applet.h	2014-04-22 11:26:52.792524438 +0300
 @@ -236,6 +236,7 @@
  	GError         *error;							\
  	int             retval;							\
@@ -14,3 +17,16 @@
  	_PANEL_APPLET_SETUP_GETTEXT (TRUE);					\
  										\
  	context = g_option_context_new ("");					\
+Index: lp1310929/gnome-panel/main.c
+===================================================================
+--- lp1310929.orig/gnome-panel/main.c	2014-04-22 11:26:52.720524440 +0300
++++ lp1310929/gnome-panel/main.c	2014-04-22 11:28:17.508522217 +0300
+@@ -55,6 +55,8 @@
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
++
+ 	/* We will register explicitly when we're ready -- see panel-session.c */
+ 	egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
+ 

=== 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 @@
 _Name=Panel
 _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
 Icon=gnome-panel
-Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel
+Exec=gnome-panel
+StartupNotify=true
 Terminal=false
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=3.8.0
 Categories=GNOME;GTK;System;Core;
-OnlyShowIn=GNOME;Unity;
+OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-AutoRestart=true
 X-GNOME-Autostart-Phase=Panel

=== 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 @@
 _Name=Panel
 _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
 Icon=gnome-panel
-Exec=env XDG_MENU_PREFIX="gnome-flashback-" gnome-panel
+Exec=gnome-panel
+StartupNotify=true
 Terminal=false
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-panel
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
 Categories=GNOME;GTK;System;Core;
-OnlyShowIn=GNOME;Unity;
+OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-AutoRestart=true
 X-GNOME-Autostart-Phase=Panel

=== 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 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
+	g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
+
 	/* We will register explicitly when we're ready -- see panel-session.c */
 	egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_DISABLED);
 

=== 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 @@
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
 data/gnome-fallback.desktop.in.in
 data/gnome-flashback.session.desktop.in
-data/gnome-fallback-compiz.desktop.in
-data/gnome-flashback-compiz.session.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in