diff -Nru gnome-screensaver-3.2.0/debian/changelog gnome-screensaver-3.2.0/debian/changelog --- gnome-screensaver-3.2.0/debian/changelog 2012-02-09 19:03:27.000000000 +0000 +++ gnome-screensaver-3.2.0/debian/changelog 2012-02-10 02:30:43.000000000 +0000 @@ -1,3 +1,16 @@ +gnome-screensaver (3.2.0-1ubuntu10) precise; urgency=low + + * debian/patches/24_use_user_settings.patch: use the user settings, and + not the default system ones, so we get the user's background when the + screen is locked. + * debian/patches/25_fix_lock_command.patch: make --lock expect a reply + so the screen gets properly locked when gnome-screensaver needs to be + respawned by dbus. This was preventing ctrl-alt-l from locking the + screen on the first attempt when the gnome-screensaver process was + dead. + + -- Marc Deslauriers Thu, 09 Feb 2012 21:27:15 -0500 + gnome-screensaver (3.2.0-1ubuntu9) precise; urgency=low * debian/patches/23_fix_capslock_warning.patch: capslock turns off when diff -Nru gnome-screensaver-3.2.0/debian/control gnome-screensaver-3.2.0/debian/control --- gnome-screensaver-3.2.0/debian/control 2012-02-09 19:23:26.000000000 +0000 +++ gnome-screensaver-3.2.0/debian/control 2012-02-10 02:37:05.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Guilherme de S. Pastore -Uploaders: Debian GNOME Maintainers , Sjoerd Simons +Uploaders: Debian GNOME Maintainers Build-Depends: cdbs, debhelper (>= 8.1.0~), dh-apport, diff -Nru gnome-screensaver-3.2.0/debian/patches/24_use_user_settings.patch gnome-screensaver-3.2.0/debian/patches/24_use_user_settings.patch --- gnome-screensaver-3.2.0/debian/patches/24_use_user_settings.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-screensaver-3.2.0/debian/patches/24_use_user_settings.patch 2012-02-10 02:31:26.000000000 +0000 @@ -0,0 +1,48 @@ +Description: use the user settings, and not the default system ones, so we + get the user's background when the screen is locked. +Author: Marc Deslauriers +Forwarded: no, is a Ubuntu-specific preference + +Index: gnome-screensaver-3.2.0/src/gs-manager.c +=================================================================== +--- gnome-screensaver-3.2.0.orig/src/gs-manager.c 2012-02-09 21:23:41.000000000 -0500 ++++ gnome-screensaver-3.2.0/src/gs-manager.c 2012-02-09 21:25:51.884447527 -0500 +@@ -555,13 +555,8 @@ + gint n_keys, + GSManager *manager) + { +-#if 0 +- /* FIXME: since we bind user settings instead of system ones, +- * watching for changes is no longer valid. +- */ + gnome_bg_load_from_preferences (manager->priv->bg, + manager->priv->settings); +-#endif + + return FALSE; + } +@@ -570,24 +565,9 @@ + get_system_settings (void) + { + GSettings *settings; +- gchar **keys; +- gchar **k; + +- /* FIXME: we need to bind system settings instead of user but +- * that's currently impossible, not implemented yet. +- * Hence, reset to system default values. +- */ +- /* TODO: Ideally we would like to bind some other key, screensaver-specific. */ + settings = g_settings_new ("org.gnome.desktop.background"); + +- g_settings_delay (settings); +- +- keys = g_settings_list_keys (settings); +- for (k = keys; *k; k++) { +- g_settings_reset (settings, *k); +- } +- g_strfreev (keys); +- + return settings; + } + diff -Nru gnome-screensaver-3.2.0/debian/patches/25_fix_lock_command.patch gnome-screensaver-3.2.0/debian/patches/25_fix_lock_command.patch --- gnome-screensaver-3.2.0/debian/patches/25_fix_lock_command.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-screensaver-3.2.0/debian/patches/25_fix_lock_command.patch 2012-02-10 02:32:49.000000000 +0000 @@ -0,0 +1,26 @@ +Description: make --lock expect a reply so the screen gets properly locked + when gnome-screensaver needs to be respawned by dbus. This was preventing + ctrl-alt-l from locking the screen on the first attempt when the + gnome-screensaver process was dead. +Author: Marc Deslauriers +Forwarded: no, upstream doesn't configure gnome-screensaver as a dbus service + +Index: gnome-screensaver-3.2.0/src/gnome-screensaver-command.c +=================================================================== +--- gnome-screensaver-3.2.0.orig/src/gnome-screensaver-command.c 2012-02-09 21:27:09.936449525 -0500 ++++ gnome-screensaver-3.2.0/src/gnome-screensaver-command.c 2012-02-09 21:32:41.140458005 -0500 +@@ -260,8 +260,12 @@ + } + + if (do_lock) { +- reply = screensaver_send_message_void (connection, "Lock", FALSE); +- g_assert (reply == NULL); ++ reply = screensaver_send_message_void (connection, "Lock", TRUE); ++ if (reply == NULL) { ++ g_message ("Did not receive a reply from the screensaver."); ++ goto done; ++ } ++ g_object_unref (reply); + } + + if (do_activate) { diff -Nru gnome-screensaver-3.2.0/debian/patches/series gnome-screensaver-3.2.0/debian/patches/series --- gnome-screensaver-3.2.0/debian/patches/series 2012-02-09 18:50:12.000000000 +0000 +++ gnome-screensaver-3.2.0/debian/patches/series 2012-02-10 02:26:23.000000000 +0000 @@ -15,3 +15,5 @@ 21_properly_lock_when_activated.patch 22_dont_show_numlock_warning.patch 23_fix_capslock_warning.patch +24_use_user_settings.patch +25_fix_lock_command.patch