← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-control-center/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/patches/00git_use_correct_sleep_timeout_when_disabled.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya, Gunnar Hjalmarsson, Rodrigo Moya
  • Date: 2011-10-18 11:39:14 UTC
  • mfrom: (1.1.54 upstream)
  • Revision ID: james.westby@ubuntu.com-20111018113914-56oauncesm3raqm3
Tags: 1:3.2.1-0ubuntu1
https://launchpad.net/bugs/864618
https://launchpad.net/bugs/841280
[ Gunnar Hjalmarsson ]
* debian/patches/52_ubuntu_language_list_mods.patch:
  Don't mess with non-utf8 locales, or else the language chooser in
  the User Accounts UI may display confusing info (LP: #864618).

[ Rodrigo Moya ]
* New upstream release
* debian/patches/00git_show_search_view.patch:
* debian/patches/00git_show_section_labels.patch:
* debian/patches/00git_use_correct_sleep_timeout_when_disabled.patch:
* debian/patches/00git_use_gtk_widget_show.patch:
  - Remove upstreamed patches
* debian/patches/08_dont_crash_on_null_territories.patch:
  - Don't crash on locales with no territory code (LP: #841280)
* debian/patches/12_add_never_turn_screen_off.patch:
  - Remove translations from patch, as they are now imported to LP
* debian/patches/52_ubuntu_language_list_mods.patch:
  - Rebased patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00git_use_correct_sleep_timeout_when_disabled.patch
1
 
From 7929a519af5119e6c78b93107cb5de9405f7d01f Mon Sep 17 00:00:00 2001
2
 
From: Rodrigo Moya <rodrigo@gnome-db.org>
3
 
Date: Tue, 27 Sep 2011 16:08:37 +0200
4
 
Subject: [PATCH] power: Use the correct item in the combo boxes when
5
 
 sleep-when-inactive is disabled
6
 
 
7
 
---
8
 
 panels/power/cc-power-panel.c |    8 ++++++++
9
 
 1 files changed, 8 insertions(+), 0 deletions(-)
10
 
 
11
 
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
12
 
index c069187..92b2e85 100644
13
 
--- a/panels/power/cc-power-panel.c
14
 
+++ b/panels/power/cc-power-panel.c
15
 
@@ -602,6 +602,10 @@ cc_power_panel_init (CcPowerPanel *self)
16
 
 
17
 
   /* auto-sleep time */
18
 
   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-ac-timeout");
19
 
+  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-ac"))
20
 
+    {
21
 
+      value = 0;
22
 
+    }
23
 
   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
24
 
                                                "combobox_sleep_ac"));
25
 
   set_value_for_combo (GTK_COMBO_BOX (widget), value);
26
 
@@ -610,6 +614,10 @@ cc_power_panel_init (CcPowerPanel *self)
27
 
                     G_CALLBACK (combo_time_changed_cb),
28
 
                     self);
29
 
   value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-battery-timeout");
30
 
+  if (!g_settings_get_boolean (self->priv->gsd_settings, "sleep-inactive-battery"))
31
 
+    {
32
 
+      value = 0;
33
 
+    }
34
 
   widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
35
 
                                                "combobox_sleep_battery"));
36
 
   set_value_for_combo (GTK_COMBO_BOX (widget), value);
37
 
 
38
 
diff --git a/panels/screen/cc-screen-panel.c b/panels/screen/cc-screen-panel.c
39
 
index 4bf5bfa..339cb29 100644
40
 
--- a/panels/screen/cc-screen-panel.c
41
 
+++ b/panels/screen/cc-screen-panel.c
42
 
@@ -312,7 +312,7 @@ set_idle_delay_from_dpms (CcScreenPanel *self,
43
 
 {
44
 
   guint off_delay;
45
 
 
46
 
-  off_delay = 1;
47
 
+  off_delay = 0;
48
 
 
49
 
   if (value > 0)
50
 
     off_delay = (guint) value;
51
 
1.7.5.4
52