diff -Nru gnome-panel-2.32.1/debian/changelog gnome-panel-2.32.1/debian/changelog --- gnome-panel-2.32.1/debian/changelog 2011-04-07 10:53:07.000000000 -0500 +++ gnome-panel-2.32.1/debian/changelog 2011-04-19 08:49:21.000000000 -0500 @@ -1,3 +1,10 @@ +gnome-panel (1:2.32.1-0ubuntu7) natty; urgency=low + + * debian/patches/25_dynamic_fusa_detection.patch: Check for indicator + applet complete as well as fusa. (LP: #506404) + + -- Ted Gould Tue, 19 Apr 2011 08:48:23 -0500 + gnome-panel (1:2.32.1-0ubuntu6.2) natty; urgency=low * Update the layout to be closer from the previous cycle oben changing back diff -Nru gnome-panel-2.32.1/debian/patches/25_dynamic_fusa_detection.patch gnome-panel-2.32.1/debian/patches/25_dynamic_fusa_detection.patch --- gnome-panel-2.32.1/debian/patches/25_dynamic_fusa_detection.patch 2011-04-07 10:53:07.000000000 -0500 +++ gnome-panel-2.32.1/debian/patches/25_dynamic_fusa_detection.patch 2011-04-19 08:48:22.000000000 -0500 @@ -1,10 +1,13 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL Description: Remove the shutdown, logout and lock screen items when the FUSA applet is on the panel Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-panel/+bug/335242 -Index: gnome-panel-2.32.0/gnome-panel/applet-signaler.c +Index: gnome-panel-2.32.1/gnome-panel/applet-signaler.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-panel-2.32.0/gnome-panel/applet-signaler.c 2010-10-15 18:48:44.000000000 +0200 ++++ gnome-panel-2.32.1/gnome-panel/applet-signaler.c 2011-04-19 08:40:27.705316019 -0500 @@ -0,0 +1,133 @@ +/* + * Fast User Switch Applet: status-manager.c @@ -139,10 +142,10 @@ + return; +} + -Index: gnome-panel-2.32.0/gnome-panel/applet-signaler.h +Index: gnome-panel-2.32.1/gnome-panel/applet-signaler.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-panel-2.32.0/gnome-panel/applet-signaler.h 2010-10-15 18:48:44.000000000 +0200 ++++ gnome-panel-2.32.1/gnome-panel/applet-signaler.h 2011-04-19 08:40:27.705316019 -0500 @@ -0,0 +1,52 @@ +/* + * Fast User Switch Applet: status-manager.c @@ -196,10 +199,10 @@ +G_END_DECLS + +#endif /* APPLET_SIGNALER_H */ -Index: gnome-panel-2.32.0/gnome-panel/applet.c +Index: gnome-panel-2.32.1/gnome-panel/applet.c =================================================================== ---- gnome-panel-2.32.0.orig/gnome-panel/applet.c 2010-09-06 19:55:32.000000000 +0200 -+++ gnome-panel-2.32.0/gnome-panel/applet.c 2010-10-15 18:48:44.108592194 +0200 +--- gnome-panel-2.32.1.orig/gnome-panel/applet.c 2011-04-19 08:40:26.314746668 -0500 ++++ gnome-panel-2.32.1/gnome-panel/applet.c 2011-04-19 08:40:27.705316019 -0500 @@ -34,6 +34,7 @@ #include "panel-globals.h" #include "panel-properties-dialog.h" @@ -295,10 +298,10 @@ return info; } -Index: gnome-panel-2.32.0/gnome-panel/applet.h +Index: gnome-panel-2.32.1/gnome-panel/applet.h =================================================================== ---- gnome-panel-2.32.0.orig/gnome-panel/applet.h 2010-03-17 07:45:18.000000000 +0100 -+++ gnome-panel-2.32.0/gnome-panel/applet.h 2010-10-15 18:48:44.108592194 +0200 +--- gnome-panel-2.32.1.orig/gnome-panel/applet.h 2011-04-19 08:40:26.364767143 -0500 ++++ gnome-panel-2.32.1/gnome-panel/applet.h 2011-04-19 08:40:27.705316019 -0500 @@ -56,8 +56,10 @@ void panel_applet_stop_loading (const char *id); @@ -310,10 +313,10 @@ AppletInfo *panel_applet_get_by_type (PanelObjectType object_type, GdkScreen *screen); GSList *panel_applet_list_applets (void); -Index: gnome-panel-2.32.0/gnome-panel/panel-applet-frame.c +Index: gnome-panel-2.32.1/gnome-panel/panel-applet-frame.c =================================================================== ---- gnome-panel-2.32.0.orig/gnome-panel/panel-applet-frame.c 2010-09-06 23:39:18.000000000 +0200 -+++ gnome-panel-2.32.0/gnome-panel/panel-applet-frame.c 2010-10-15 18:48:44.112592191 +0200 +--- gnome-panel-2.32.1.orig/gnome-panel/panel-applet-frame.c 2011-04-19 08:40:26.404783523 -0500 ++++ gnome-panel-2.32.1/gnome-panel/panel-applet-frame.c 2011-04-19 08:40:27.715320116 -0500 @@ -1004,3 +1004,15 @@ g_free (id); @@ -330,10 +333,10 @@ + + return frame->priv->iid; +} -Index: gnome-panel-2.32.0/gnome-panel/panel-menu-bar.c +Index: gnome-panel-2.32.1/gnome-panel/panel-menu-bar.c =================================================================== ---- gnome-panel-2.32.0.orig/gnome-panel/panel-menu-bar.c 2010-10-15 18:48:44.084592194 +0200 -+++ gnome-panel-2.32.0/gnome-panel/panel-menu-bar.c 2010-10-15 18:48:44.116592192 +0200 +--- gnome-panel-2.32.1.orig/gnome-panel/panel-menu-bar.c 2011-04-19 08:40:27.665299631 -0500 ++++ gnome-panel-2.32.1/gnome-panel/panel-menu-bar.c 2011-04-19 08:44:36.281440856 -0500 @@ -47,6 +47,7 @@ #include "panel-stock-icons.h" #include "panel-typebuiltins.h" @@ -342,11 +345,12 @@ G_DEFINE_TYPE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR) -@@ -99,9 +100,53 @@ +@@ -99,9 +100,56 @@ return FALSE; } +#define FUSA_APPLET_IID "OAFIID:GNOME_FastUserSwitchApplet" ++#define INDICATOR_APPLET_COMPLETE_IID "OAFIID:GNOME_IndicatorAppletComplete" + +static void +panel_menu_bar_set_tooltip_remove (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) @@ -355,7 +359,8 @@ + if (iid == NULL) + return; + -+ if (!strcmp(iid, FUSA_APPLET_IID)) ++ if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 || ++ g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0) + panel_util_set_tooltip_text (widget, + _("Change desktop appearance and behavior, get help, or log out")); + @@ -369,7 +374,8 @@ + if (iid == NULL) + return; + -+ if (!strcmp(iid, FUSA_APPLET_IID)) ++ if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 || ++ g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0) + panel_util_set_tooltip_text (widget, + _("Change system appearance and behavior, or get help")); + @@ -396,7 +402,7 @@ panel_util_set_tooltip_text (menubar->priv->applications_item, _("Browse and run installed applications")); panel_util_set_tooltip_text (menubar->priv->places_item, -@@ -109,6 +154,16 @@ +@@ -109,6 +157,16 @@ panel_util_set_tooltip_text (menubar->priv->desktop_item, _("Change desktop appearance and behavior, get help, or log out")); @@ -413,10 +419,10 @@ //FIXME: this doesn't handle the right-click case. Sigh. /* Hide tooltip if a menu is activated */ g_signal_connect (menubar->priv->applications_item, -Index: gnome-panel-2.32.0/gnome-panel/panel-menu-items.c +Index: gnome-panel-2.32.1/gnome-panel/panel-menu-items.c =================================================================== ---- gnome-panel-2.32.0.orig/gnome-panel/panel-menu-items.c 2010-10-15 18:48:43.984592196 +0200 -+++ gnome-panel-2.32.0/gnome-panel/panel-menu-items.c 2010-10-15 18:48:44.116592192 +0200 +--- gnome-panel-2.32.1.orig/gnome-panel/panel-menu-items.c 2011-04-19 08:40:27.505234079 -0500 ++++ gnome-panel-2.32.1/gnome-panel/panel-menu-items.c 2011-04-19 08:48:05.624659003 -0500 @@ -54,6 +54,7 @@ #include "panel-recent.h" #include "panel-stock-icons.h" @@ -425,11 +431,12 @@ #define BOOKMARKS_FILENAME ".gtk-bookmarks" #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences" -@@ -1533,6 +1534,58 @@ +@@ -1533,6 +1534,61 @@ "menu_panel", panel); } +#define FUSA_APPLET_IID "OAFIID:GNOME_FastUserSwitchApplet" ++#define INDICATOR_APPLET_COMPLETE_IID "OAFIID:GNOME_IndicatorAppletComplete" + +static void +panel_menu_items_hide_on_fusa (PanelAppletSignaler * pas, AppletInfo * info, GtkWidget * widget) @@ -444,7 +451,8 @@ + if (iid == NULL) + return; + -+ if (!strcmp(iid, FUSA_APPLET_IID)) ++ if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 || ++ g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0) + gtk_widget_hide(widget); + + return; @@ -463,7 +471,8 @@ + if (iid == NULL) + return; + -+ if (!strcmp(iid, FUSA_APPLET_IID)) ++ if (g_strcmp0(iid, FUSA_APPLET_IID) == 0 || ++ g_strcmp0(iid, INDICATOR_APPLET_COMPLETE_IID) == 0) + gtk_widget_show(widget); + + return; @@ -484,7 +493,7 @@ void panel_menu_items_append_lock_logout (GtkWidget *menu) { -@@ -1543,6 +1596,11 @@ +@@ -1543,6 +1599,13 @@ const char *translate; char *label; char *tooltip; @@ -493,10 +502,12 @@ + PanelAppletSignaler *signaler = panel_applet_signaler_get_default (); + + fusa = panel_applet_get_by_iid(FUSA_APPLET_IID); ++ if (fusa == NULL) ++ fusa = panel_applet_get_by_iid(INDICATOR_APPLET_COMPLETE_IID); separator_inserted = FALSE; children = gtk_container_get_children (GTK_CONTAINER (menu)); -@@ -1550,17 +1608,42 @@ +@@ -1550,17 +1613,42 @@ if (last != NULL) { separator_inserted = GTK_IS_SEPARATOR (GTK_WIDGET (last->data)); } @@ -540,7 +551,7 @@ } } -@@ -1603,19 +1686,65 @@ +@@ -1603,19 +1691,65 @@ if (item != NULL) { if (!separator_inserted) { @@ -608,9 +619,10 @@ } } -diff -Nur gnome-panel-2.32.0/gnome-panel/Makefile.am gnome-panel-2.32.0ubuntu/gnome-panel/Makefile.am ---- gnome-panel-2.32.0/gnome-panel/Makefile.am 2010-09-20 17:49:51.000000000 +0200 -+++ gnome-panel-2.32.0ubuntu/gnome-panel/Makefile.am 2010-10-15 19:40:37.000000000 +0200 +Index: gnome-panel-2.32.1/gnome-panel/Makefile.am +=================================================================== +--- gnome-panel-2.32.1.orig/gnome-panel/Makefile.am 2011-04-19 08:40:26.334754858 -0500 ++++ gnome-panel-2.32.1/gnome-panel/Makefile.am 2011-04-19 08:40:27.715320116 -0500 @@ -67,7 +67,8 @@ panel-addto.c \ panel-ditem-editor.c \ @@ -631,9 +643,10 @@ gnome_panel_SOURCES = \ $(panel_sources) \ -diff -Nur gnome-panel-2.32.0/gnome-panel/panel-applet-frame.h gnome-panel-2.32.0ubuntu/gnome-panel/panel-applet-frame.h ---- gnome-panel-2.32.0/gnome-panel/panel-applet-frame.h 2010-06-23 01:00:28.000000000 +0200 -+++ gnome-panel-2.32.0ubuntu/gnome-panel/panel-applet-frame.h 2010-10-15 19:39:45.000000000 +0200 +Index: gnome-panel-2.32.1/gnome-panel/panel-applet-frame.h +=================================================================== +--- gnome-panel-2.32.1.orig/gnome-panel/panel-applet-frame.h 2011-04-19 08:40:26.384775333 -0500 ++++ gnome-panel-2.32.1/gnome-panel/panel-applet-frame.h 2011-04-19 08:40:27.715320116 -0500 @@ -137,6 +137,9 @@ void _panel_applet_frame_applet_move (PanelAppletFrame *frame); void _panel_applet_frame_applet_lock (PanelAppletFrame *frame,