diff -Nru gnome-panel-3.3.5/debian/changelog gnome-panel-3.3.5/debian/changelog --- gnome-panel-3.3.5/debian/changelog 2012-02-08 05:17:43.000000000 +0000 +++ gnome-panel-3.3.5/debian/changelog 2012-02-10 19:48:51.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-panel (1:3.3.5-0ubuntu2) precise; urgency=low + + * debian/patches/41_classic_layout.patch: + - Change the defaults to be more "classic Ubuntu": Show indicators + & show desktop, drop GNOME clock & notification area (LP: #846378) + + -- Jeremy Bicha Fri, 10 Feb 2012 14:48:34 -0500 + gnome-panel (1:3.3.5-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru gnome-panel-3.3.5/debian/control gnome-panel-3.3.5/debian/control --- gnome-panel-3.3.5/debian/control 2012-02-08 05:17:50.000000000 +0000 +++ gnome-panel-3.3.5/debian/control 2012-02-10 19:48:53.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Gustavo Noronha Silva , Josselin Mouette , Michael Biebl +Uploaders: Debian GNOME Maintainers , Gustavo Noronha Silva , Josselin Mouette , Michael Biebl Standards-Version: 3.9.2 Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), @@ -70,7 +70,8 @@ gnome-icon-theme (>= 2.24), alacarte, gnome-settings-daemon, - gvfs + gvfs, + indicator-applet-complete Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator, diff -Nru gnome-panel-3.3.5/debian/control.in gnome-panel-3.3.5/debian/control.in --- gnome-panel-3.3.5/debian/control.in 2012-02-08 05:17:43.000000000 +0000 +++ gnome-panel-3.3.5/debian/control.in 2012-02-10 19:48:51.000000000 +0000 @@ -65,7 +65,8 @@ gnome-icon-theme (>= 2.24), alacarte, gnome-settings-daemon, - gvfs + gvfs, + indicator-applet-complete Suggests: yelp, gnome2-user-guide, gnome-terminal | x-terminal-emulator, diff -Nru gnome-panel-3.3.5/debian/patches/14_revert_timedate_change.patch gnome-panel-3.3.5/debian/patches/14_revert_timedate_change.patch --- gnome-panel-3.3.5/debian/patches/14_revert_timedate_change.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-panel-3.3.5/debian/patches/14_revert_timedate_change.patch 2012-02-10 19:48:51.000000000 +0000 @@ -0,0 +1,151 @@ +Index: gnome-panel-3.3.5/applets/clock/clock.c +=================================================================== +--- gnome-panel-3.3.5.orig/applets/clock/clock.c 2012-02-02 11:51:27.000000000 -0500 ++++ gnome-panel-3.3.5/applets/clock/clock.c 2012-02-07 22:57:41.193548904 -0500 +@@ -68,6 +68,7 @@ + #include "clock-location-tile.h" + #include "clock-map.h" + #include "clock-utils.h" ++#include "set-timezone.h" + #include "system-timezone.h" + + #define INTERNETSECOND (864) +Index: gnome-panel-3.3.5/applets/clock/set-timezone.c +=================================================================== +--- gnome-panel-3.3.5.orig/applets/clock/set-timezone.c 2012-02-02 11:51:54.000000000 -0500 ++++ gnome-panel-3.3.5/applets/clock/set-timezone.c 2012-02-07 22:58:04.109662547 -0500 +@@ -23,17 +23,23 @@ + #endif + + #include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "set-timezone.h" + + #define CACHE_VALIDITY_SEC 20 + +-#define MECHANISM_BUS_NAME "org.freedesktop.timedate1" +-#define MECHANISM_OBJECT_PATH "/org/freedesktop/timedate1" +-#define MECHANISM_INTERFACE "org.freedesktop.timedate1" ++#define MECHANISM_BUS_NAME "org.gnome.SettingsDaemon.DateTimeMechanism" ++#define MECHANISM_OBJECT_PATH "/" ++#define MECHANISM_INTERFACE "org.gnome.SettingsDaemon.DateTimeMechanism" + + typedef struct { ++ gboolean in_progress; + gint value; + guint64 stamp; + } Cache; +@@ -59,6 +65,27 @@ + return system; + } + ++static void ++can_set_call_finished (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ Cache *cache = user_data; ++ GVariant *reply; ++ ++ reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), ++ result, NULL); ++ ++ if (reply != NULL) ++ { ++ g_variant_get (reply, "(i)", &cache->value); ++ g_variant_unref (reply); ++ } ++ ++ cache->stamp = g_get_monotonic_time (); ++ cache->in_progress = FALSE; ++} ++ + static int + can_set (Cache *cache, const gchar *method_name) + { +@@ -66,39 +93,23 @@ + + if (now - cache->stamp > (CACHE_VALIDITY_SEC * 1000000)) + { +- PolkitAuthority *authority; +- PolkitSubject *subject; +- PolkitAuthorizationResult *res; +- +- authority = polkit_authority_get_sync (NULL, NULL); +- subject = polkit_unix_session_new_for_process_sync (getpid (), NULL, NULL); +- +- res = polkit_authority_check_authorization_sync (authority, +- subject, +- "org.freedesktop.timedate1.set-timezone", +- NULL, +- POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, +- NULL, +- NULL); +- +- cache->stamp = g_get_monotonic_time (); +- +- if (res == NULL) +- cache->value = 0; +- else +- { +- if (polkit_authorization_result_get_is_authorized (res)) +- cache->value = 2; +- else if (polkit_authorization_result_get_is_challenge (res)) +- cache->value = 1; +- else +- cache->value = 0; +- +- g_object_unref (res); +- } +- +- g_object_unref (authority); +- g_object_unref (subject); ++ if (!cache->in_progress) ++ { ++ GDBusConnection *system_bus = get_system_bus (NULL); ++ ++ if (system_bus != NULL) ++ g_dbus_connection_call (system_bus, MECHANISM_BUS_NAME, ++ MECHANISM_OBJECT_PATH, MECHANISM_INTERFACE, ++ method_name, NULL, G_VARIANT_TYPE ("(i)"), ++ G_DBUS_CALL_FLAGS_NONE, -1, NULL, ++ can_set_call_finished, cache); ++ ++ /* Even if the system bus was NULL, we want to set this in ++ * order to effectively wedge ourselves from ever trying ++ * again. ++ */ ++ cache->in_progress = TRUE; ++ } + } + + return cache->value; +@@ -159,7 +170,7 @@ + + g_dbus_connection_call (system_bus, MECHANISM_BUS_NAME, + MECHANISM_OBJECT_PATH, MECHANISM_INTERFACE, +- "SetTimezone", g_variant_new ("(sb)", tz, TRUE), ++ "SetTimezone", g_variant_new ("(s)", tz, TRUE), + NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, + callback, user_data); + } +Index: gnome-panel-3.3.5/configure.ac +=================================================================== +--- gnome-panel-3.3.5.orig/configure.ac 2012-02-06 06:18:37.000000000 -0500 ++++ gnome-panel-3.3.5/configure.ac 2012-02-07 22:57:41.201548946 -0500 +@@ -144,7 +144,7 @@ + AC_SUBST(TZ_CFLAGS) + AC_SUBST(TZ_LIBS) + +-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1) ++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED) + AC_SUBST(CLOCK_CFLAGS) + AC_SUBST(CLOCK_LIBS) + diff -Nru gnome-panel-3.3.5/debian/patches/14_revert-timedate-change.patch gnome-panel-3.3.5/debian/patches/14_revert-timedate-change.patch --- gnome-panel-3.3.5/debian/patches/14_revert-timedate-change.patch 2012-02-08 05:17:43.000000000 +0000 +++ gnome-panel-3.3.5/debian/patches/14_revert-timedate-change.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -Index: gnome-panel-3.3.5/applets/clock/clock.c -=================================================================== ---- gnome-panel-3.3.5.orig/applets/clock/clock.c 2012-02-02 11:51:27.000000000 -0500 -+++ gnome-panel-3.3.5/applets/clock/clock.c 2012-02-07 22:57:41.193548904 -0500 -@@ -68,6 +68,7 @@ - #include "clock-location-tile.h" - #include "clock-map.h" - #include "clock-utils.h" -+#include "set-timezone.h" - #include "system-timezone.h" - - #define INTERNETSECOND (864) -Index: gnome-panel-3.3.5/applets/clock/set-timezone.c -=================================================================== ---- gnome-panel-3.3.5.orig/applets/clock/set-timezone.c 2012-02-02 11:51:54.000000000 -0500 -+++ gnome-panel-3.3.5/applets/clock/set-timezone.c 2012-02-07 22:58:04.109662547 -0500 -@@ -23,17 +23,23 @@ - #endif - - #include --#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include "set-timezone.h" - - #define CACHE_VALIDITY_SEC 20 - --#define MECHANISM_BUS_NAME "org.freedesktop.timedate1" --#define MECHANISM_OBJECT_PATH "/org/freedesktop/timedate1" --#define MECHANISM_INTERFACE "org.freedesktop.timedate1" -+#define MECHANISM_BUS_NAME "org.gnome.SettingsDaemon.DateTimeMechanism" -+#define MECHANISM_OBJECT_PATH "/" -+#define MECHANISM_INTERFACE "org.gnome.SettingsDaemon.DateTimeMechanism" - - typedef struct { -+ gboolean in_progress; - gint value; - guint64 stamp; - } Cache; -@@ -59,6 +65,27 @@ - return system; - } - -+static void -+can_set_call_finished (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ Cache *cache = user_data; -+ GVariant *reply; -+ -+ reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), -+ result, NULL); -+ -+ if (reply != NULL) -+ { -+ g_variant_get (reply, "(i)", &cache->value); -+ g_variant_unref (reply); -+ } -+ -+ cache->stamp = g_get_monotonic_time (); -+ cache->in_progress = FALSE; -+} -+ - static int - can_set (Cache *cache, const gchar *method_name) - { -@@ -66,39 +93,23 @@ - - if (now - cache->stamp > (CACHE_VALIDITY_SEC * 1000000)) - { -- PolkitAuthority *authority; -- PolkitSubject *subject; -- PolkitAuthorizationResult *res; -- -- authority = polkit_authority_get_sync (NULL, NULL); -- subject = polkit_unix_session_new_for_process_sync (getpid (), NULL, NULL); -- -- res = polkit_authority_check_authorization_sync (authority, -- subject, -- "org.freedesktop.timedate1.set-timezone", -- NULL, -- POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, -- NULL, -- NULL); -- -- cache->stamp = g_get_monotonic_time (); -- -- if (res == NULL) -- cache->value = 0; -- else -- { -- if (polkit_authorization_result_get_is_authorized (res)) -- cache->value = 2; -- else if (polkit_authorization_result_get_is_challenge (res)) -- cache->value = 1; -- else -- cache->value = 0; -- -- g_object_unref (res); -- } -- -- g_object_unref (authority); -- g_object_unref (subject); -+ if (!cache->in_progress) -+ { -+ GDBusConnection *system_bus = get_system_bus (NULL); -+ -+ if (system_bus != NULL) -+ g_dbus_connection_call (system_bus, MECHANISM_BUS_NAME, -+ MECHANISM_OBJECT_PATH, MECHANISM_INTERFACE, -+ method_name, NULL, G_VARIANT_TYPE ("(i)"), -+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, -+ can_set_call_finished, cache); -+ -+ /* Even if the system bus was NULL, we want to set this in -+ * order to effectively wedge ourselves from ever trying -+ * again. -+ */ -+ cache->in_progress = TRUE; -+ } - } - - return cache->value; -@@ -159,7 +170,7 @@ - - g_dbus_connection_call (system_bus, MECHANISM_BUS_NAME, - MECHANISM_OBJECT_PATH, MECHANISM_INTERFACE, -- "SetTimezone", g_variant_new ("(sb)", tz, TRUE), -+ "SetTimezone", g_variant_new ("(s)", tz, TRUE), - NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, - callback, user_data); - } -Index: gnome-panel-3.3.5/configure.ac -=================================================================== ---- gnome-panel-3.3.5.orig/configure.ac 2012-02-06 06:18:37.000000000 -0500 -+++ gnome-panel-3.3.5/configure.ac 2012-02-07 22:57:41.201548946 -0500 -@@ -144,7 +144,7 @@ - AC_SUBST(TZ_CFLAGS) - AC_SUBST(TZ_LIBS) - --PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1) -+PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED) - AC_SUBST(CLOCK_CFLAGS) - AC_SUBST(CLOCK_LIBS) - diff -Nru gnome-panel-3.3.5/debian/patches/41_classic_layout.patch gnome-panel-3.3.5/debian/patches/41_classic_layout.patch --- gnome-panel-3.3.5/debian/patches/41_classic_layout.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-panel-3.3.5/debian/patches/41_classic_layout.patch 2012-02-10 19:48:51.000000000 +0000 @@ -0,0 +1,40 @@ +Index: gnome-panel-3.3.5/data/panel-default-layout.layout +=================================================================== +--- gnome-panel-3.3.5.orig/data/panel-default-layout.layout 2011-04-01 06:39:58.000000000 -0400 ++++ gnome-panel-3.3.5/data/panel-default-layout.layout 2012-02-10 00:03:26.071855669 -0500 +@@ -14,28 +14,21 @@ + toplevel-id=top-panel + pack-index=0 + +-[Object clock] +-object-iid=ClockAppletFactory::ClockApplet +-toplevel-id=top-panel +-pack-type=center +-pack-index=0 +- +-[Object notification-area] +-object-iid=NotificationAreaAppletFactory::NotificationArea ++[Object indicators] ++object-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete + toplevel-id=top-panel + pack-type=end +-pack-index=1 ++pack-index=0 + +-[Object user-menu] +-object-iid=PanelInternalFactory::UserMenu +-toplevel-id=top-panel +-pack-type=end ++[Object show-desktop] ++object-iid=WnckletFactory::ShowDesktopApplet ++toplevel-id=bottom-panel + pack-index=0 + + [Object window-list] + object-iid=WnckletFactory::WindowListApplet + toplevel-id=bottom-panel +-pack-index=0 ++pack-index=1 + + [Object workspace-switcher] + object-iid=WnckletFactory::WorkspaceSwitcherApplet diff -Nru gnome-panel-3.3.5/debian/patches/series gnome-panel-3.3.5/debian/patches/series --- gnome-panel-3.3.5/debian/patches/series 2012-02-08 05:17:43.000000000 +0000 +++ gnome-panel-3.3.5/debian/patches/series 2012-02-10 19:48:51.000000000 +0000 @@ -4,6 +4,7 @@ 10_bookmarks_limit.patch 11_compat_options.patch 13_disable_missing_help.patch -14_revert-timedate-change.patch +14_revert_timedate_change.patch 40_unset_menuproxy.patch +41_classic_layout.patch 85_disable_shutdown_on_ltsp.patch