← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnome-screensaver/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/24_use_user_settings.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-09 21:27:15 UTC
  • Revision ID: package-import@ubuntu.com-20120209212715-ovao82iaacqibl4s
Tags: 3.2.0-1ubuntu10
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/24_use_user_settings.patch
 
1
Description: use the user settings, and not the default system ones, so we
 
2
 get the user's background when the screen is locked.
 
3
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
 
4
Forwarded: no, is a Ubuntu-specific preference
 
5
 
 
6
Index: gnome-screensaver-3.2.0/src/gs-manager.c
 
7
===================================================================
 
8
--- gnome-screensaver-3.2.0.orig/src/gs-manager.c       2012-02-09 21:23:41.000000000 -0500
 
9
+++ gnome-screensaver-3.2.0/src/gs-manager.c    2012-02-09 21:25:51.884447527 -0500
 
10
@@ -555,13 +555,8 @@
 
11
                                      gint       n_keys,
 
12
                                      GSManager   *manager)
 
13
 {
 
14
-#if 0
 
15
-        /* FIXME: since we bind user settings instead of system ones,
 
16
-         *        watching for changes is no longer valid.
 
17
-         */
 
18
         gnome_bg_load_from_preferences (manager->priv->bg,
 
19
                                         manager->priv->settings);
 
20
-#endif
 
21
 
 
22
         return FALSE;
 
23
 }
 
24
@@ -570,24 +565,9 @@
 
25
 get_system_settings (void)
 
26
 {
 
27
         GSettings *settings;
 
28
-        gchar **keys;
 
29
-        gchar **k;
 
30
 
 
31
-        /* FIXME: we need to bind system settings instead of user but
 
32
-         *        that's currently impossible, not implemented yet.
 
33
-         *        Hence, reset to system default values.
 
34
-         */
 
35
-        /* TODO: Ideally we would like to bind some other key, screensaver-specific. */
 
36
         settings = g_settings_new ("org.gnome.desktop.background");
 
37
 
 
38
-        g_settings_delay (settings);
 
39
-
 
40
-        keys = g_settings_list_keys (settings);
 
41
-        for (k = keys; *k; k++) {
 
42
-                g_settings_reset (settings, *k);
 
43
-        }
 
44
-        g_strfreev (keys);
 
45
-
 
46
         return settings;
 
47
 }
 
48