diff -Nru gnome-settings-daemon-3.4.0/debian/changelog gnome-settings-daemon-3.4.0/debian/changelog --- gnome-settings-daemon-3.4.0/debian/changelog 2012-03-29 21:44:51.000000000 +0200 +++ gnome-settings-daemon-3.4.0/debian/changelog 2012-03-30 01:19:25.000000000 +0200 @@ -1,3 +1,10 @@ +gnome-settings-daemon (3.4.0-0ubuntu3) precise; urgency=low + + * 60_unity_hide_status_icon.patch: also hide the status icon when + GNOME classic is used. + + -- Whoopie Fri, 30 Mar 2012 01:19:06 +0200 + gnome-settings-daemon (3.4.0-0ubuntu2) precise; urgency=low * debian/patches/10_smaller_syndaemon_timeout.patch: diff -Nru gnome-settings-daemon-3.4.0/debian/patches/60_unity_hide_status_icon.patch gnome-settings-daemon-3.4.0/debian/patches/60_unity_hide_status_icon.patch --- gnome-settings-daemon-3.4.0/debian/patches/60_unity_hide_status_icon.patch 2012-03-29 21:44:51.000000000 +0200 +++ gnome-settings-daemon-3.4.0/debian/patches/60_unity_hide_status_icon.patch 2012-03-30 01:21:08.000000000 +0200 @@ -1,33 +1,33 @@ -Index: gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c +Index: gnome-settings-daemon-3.4.0/plugins/power/gsd-power-manager.c =================================================================== ---- gnome-settings-daemon-3.3.91.orig/plugins/power/gsd-power-manager.c 2012-03-08 13:59:58.974131762 -0500 -+++ gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c 2012-03-08 14:00:13.250132125 -0500 -@@ -687,7 +687,10 @@ +--- gnome-settings-daemon-3.4.0.orig/plugins/power/gsd-power-manager.c 2012-03-30 01:18:00.926524354 +0200 ++++ gnome-settings-daemon-3.4.0/plugins/power/gsd-power-manager.c 2012-03-30 01:21:00.780544787 +0200 +@@ -688,7 +688,10 @@ /* show a different icon if we are disconnected */ icon = engine_get_icon (manager); - gtk_status_icon_set_visible (manager->priv->status_icon, icon != NULL); -+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) ++ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0 || g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome-classic") == 0) + gtk_status_icon_set_visible (manager->priv->status_icon, FALSE); + else + gtk_status_icon_set_visible (manager->priv->status_icon, icon != NULL); if (icon == NULL) { /* none before, now none */ -@@ -703,6 +706,8 @@ +@@ -704,6 +707,8 @@ if (manager->priv->previous_icon == NULL) { /* set fallback icon */ -+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) ++ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0 || g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome-classic") == 0) + gtk_status_icon_set_visible (manager->priv->status_icon, FALSE); gtk_status_icon_set_from_gicon (manager->priv->status_icon, icon); manager->priv->previous_icon = icon; return TRUE; -@@ -3674,6 +3679,8 @@ +@@ -3714,6 +3719,8 @@ /* TRANSLATORS: this is the title of the power manager status icon * that is only shown in fallback mode */ gtk_status_icon_set_title (manager->priv->status_icon, _("Power Manager")); -+ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0) ++ if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0 || g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome-classic") == 0) + gtk_status_icon_set_visible (manager->priv->status_icon, FALSE); /* connect to UPower for async power operations */