Ubuntu
gnome-control-center package

Merge lp:~darkxst/ubuntu/saucy/gnome-control-center/lp1228939 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

  1. Saucy (13.10)
  2. lp1228939
  3. Merge into ubuntu
Proposed by Tim Lunn
Status: Merged
Merged at revision: 604
Proposed branch: lp:~darkxst/ubuntu/saucy/gnome-control-center/lp1228939
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/patches/ubuntu_update_lock_and_power_settings.patch (+2/-2)
To merge this branch: bzr merge lp:~darkxst/ubuntu/saucy/gnome-control-center/lp1228939
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+188176@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the fix, works as it should!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-09-25 09:44:30 +0000
3+++ debian/changelog 2013-09-27 21:47:17 +0000
4@@ -1,3 +1,10 @@
5+gnome-control-center (1:3.6.3-0ubuntu40) UNRELEASED; urgency=low
6+
7+ * debian/patches: ubuntu_update_lock_and_power_settings.patch: Fix
8+ type mismatch in idle-delay setting (LP: #1228939)
9+
10+ -- Tim Lunn <tim@feathertop.org> Sat, 28 Sep 2013 06:34:25 +1000
11+
12 gnome-control-center (1:3.6.3-0ubuntu39) saucy; urgency=low
13
14 * debian/patches/input-sources-text-entry.patch:
15
16=== modified file 'debian/patches/ubuntu_update_lock_and_power_settings.patch'
17--- debian/patches/ubuntu_update_lock_and_power_settings.patch 2013-09-09 14:28:59 +0000
18+++ debian/patches/ubuntu_update_lock_and_power_settings.patch 2013-09-27 21:47:17 +0000
19@@ -21,7 +21,7 @@
20 - /* set both battery and ac keys */
21 - g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value);
22 - g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value);
23-+ g_settings_set_int (self->priv->session_settings, "idle-delay", value);
24++ g_settings_set (self->priv->session_settings, "idle-delay", "u", value);
25
26 set_idle_delay_from_dpms (self, value);
27 }
28@@ -30,7 +30,7 @@
29
30 /* try to make the UI match the AC setting */
31 - value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac");
32-+ value = g_settings_get_int (self->priv->session_settings, "idle-delay");
33++ g_settings_get (self->priv->session_settings, "idle-delay", "u", &value);
34 do
35 {
36 gtk_tree_model_get (model, &iter,

Subscribers

People subscribed via source and target branches