diff -Nru gnome-control-center-3.3.91/debian/changelog gnome-control-center-3.3.91/debian/changelog --- gnome-control-center-3.3.91/debian/changelog 2012-03-08 12:34:35.000000000 -0500 +++ gnome-control-center-3.3.91/debian/changelog 2012-03-08 14:24:16.000000000 -0500 @@ -1,3 +1,10 @@ +gnome-control-center (1:3.3.91-0ubuntu3~ppa1) precise; urgency=low + + * debian/patches/99_add_lock-on-suspend.patch: Add a new preference to + lock the screen when the system suspends. (LP: #938076) + + -- Marc Deslauriers Thu, 08 Mar 2012 14:22:44 -0500 + gnome-control-center (1:3.3.91-0ubuntu2) precise; urgency=low * debian/patches/96_sound_nua_panel.patch: diff -Nru gnome-control-center-3.3.91/debian/patches/99_add_lock-on-suspend.patch gnome-control-center-3.3.91/debian/patches/99_add_lock-on-suspend.patch --- gnome-control-center-3.3.91/debian/patches/99_add_lock-on-suspend.patch 1969-12-31 19:00:00.000000000 -0500 +++ gnome-control-center-3.3.91/debian/patches/99_add_lock-on-suspend.patch 2012-03-08 14:25:07.000000000 -0500 @@ -0,0 +1,82 @@ +Description: Add a new preference to lock the screen when the system suspends. +Author: Marc Deslauriers +Forwarded: no, likely a Ubuntu-specific preference +Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076 + +Index: gnome-control-center-3.3.91/panels/screen/cc-screen-panel.c +=================================================================== +--- gnome-control-center-3.3.91.orig/panels/screen/cc-screen-panel.c 2012-03-08 13:55:57.000000000 -0500 ++++ gnome-control-center-3.3.91/panels/screen/cc-screen-panel.c 2012-03-08 14:22:27.934166303 -0500 +@@ -531,6 +531,13 @@ + + update_lock_screen_sensitivity (self); + ++ /* bind the screen lock suspend checkbox */ ++ widget = WID ("screen_lock_suspend_switch"); ++ g_settings_bind (self->priv->lock_settings, ++ "lock-on-suspend", ++ widget, "active", ++ G_SETTINGS_BIND_DEFAULT); ++ + widget = WID ("screen_vbox"); + gtk_widget_reparent (widget, (GtkWidget *) self); + g_object_set (self, "valign", GTK_ALIGN_START, NULL); +Index: gnome-control-center-3.3.91/panels/screen/screen.ui +=================================================================== +--- gnome-control-center-3.3.91.orig/panels/screen/screen.ui 2012-03-08 13:55:57.000000000 -0500 ++++ gnome-control-center-3.3.91/panels/screen/screen.ui 2012-03-08 14:20:49.146163774 -0500 +@@ -299,6 +299,45 @@ + + + ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ False ++ 0 ++ _Require my password when waking from suspend: ++ True ++ screen_lock_suspend_switch ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ + + False + True +@@ -340,7 +379,7 @@ + + True + True +- 2 ++ 3 + + + diff -Nru gnome-control-center-3.3.91/debian/patches/series gnome-control-center-3.3.91/debian/patches/series --- gnome-control-center-3.3.91/debian/patches/series 2012-03-08 12:34:35.000000000 -0500 +++ gnome-control-center-3.3.91/debian/patches/series 2012-03-08 14:06:48.000000000 -0500 @@ -26,3 +26,4 @@ revert_ua_gsettings.patch revert_git_keyboard_gsettings.patch git_zoom_shell_only.patch +99_add_lock-on-suspend.patch