← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-control-center/saucy

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_update_lock_and_power_settings.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Tim Lunn
  • Date: 2013-09-30 16:30:03 UTC
  • Revision ID: package-import@ubuntu.com-20130930163003-im7v8d2xmek8n0mr
Tags: 1:3.6.3-0ubuntu40
https://launchpad.net/bugs/1233067
https://launchpad.net/bugs/1228939
* debian/patches/ubuntu_update_translations_template.patch
  - rename the patch, move it at the end of the series, 
    lists missing sources (lp: #1233067)

[ Tim Lunn ]
* debian/patches: ubuntu_update_lock_and_power_settings.patch: Fix
  type mismatch in idle-delay setting (LP: #1228939) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_update_lock_and_power_settings.patch
21
21
-  /* set both battery and ac keys */
22
22
-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
23
23
-  g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
24
 
+  g_settings_set_int (self->priv->session_settings, "idle-delay", value);
 
24
+  g_settings_set (self->priv->session_settings, "idle-delay", "u", value);
25
25
 
26
26
   set_idle_delay_from_dpms (self, value);
27
27
 }
30
30
 
31
31
   /* try to make the UI match the AC setting */
32
32
-  value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
33
 
+  value = g_settings_get_int (self->priv->session_settings, "idle-delay");
 
33
+  g_settings_get (self->priv->session_settings, "idle-delay",  "u", &value);
34
34
   do
35
35
     {
36
36
       gtk_tree_model_get (model, &iter,