[gnome-power-manager] Remove all the preferences options to do with the screen
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] Remove all the preferences options to do with the screen
- Date: Thu, 18 Nov 2010 12:04:48 +0000 (UTC)
commit 82e6e2e9d9a22177275f48b7165087fe416f8494
Author: Richard Hughes <richard hughsie com>
Date: Thu Nov 18 12:04:49 2010 +0000
Remove all the preferences options to do with the screen
All the options have been moved to the gnome-control-center 'Screen' module.
data/gpm-prefs.ui | 150 --------------------------
data/org.gnome.power-manager.gschema.migrate | 6 -
data/org.gnome.power-manager.gschema.xml | 30 -----
src/cc-power-panel.c | 66 -----------
src/gpm-backlight.c | 24 +++--
src/gpm-common.h | 13 ++-
src/gpm-manager.c | 13 ++-
7 files changed, 30 insertions(+), 272 deletions(-)
---
diff --git a/data/gpm-prefs.ui b/data/gpm-prefs.ui
index 5d414c5..0623b69 100644
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
@@ -23,41 +23,6 @@
<property name="border_width">12</property>
<property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox_ac_display">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label_ac_display">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Put _display to sleep when inactive for:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="combobox_ac_display">
- <property name="entry-text-column">0</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox_ac_computer">
<property name="visible">True</property>
<property name="spacing">12</property>
@@ -127,21 +92,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_ac_display_dim">
- <property name="label" translatable="yes">Di_m display when idle</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -162,41 +112,6 @@
<property name="border_width">12</property>
<property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox_battery_display">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label_battery_display">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Put _display to sleep when inactive for:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="combobox_battery_display">
- <property name="entry-text-column">0</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox_battery_computer">
<property name="visible">True</property>
<property name="spacing">12</property>
@@ -301,36 +216,6 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_battery_display_reduce">
- <property name="label" translatable="yes">_Reduce backlight brightness</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_battery_display_dim">
- <property name="label" translatable="yes">Di_m display when idle</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
</object>
<packing>
<property name="position">1</property>
@@ -353,41 +238,6 @@
<property name="border_width">12</property>
<property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox_ups_display">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label_ups_display">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Put _display to sleep when inactive for:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="combobox_ups_display">
- <property name="entry-text-column">0</property>
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox_ups_computer">
<property name="visible">True</property>
<property name="spacing">12</property>
diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
index 865af35..a981227 100644
--- a/data/org.gnome.power-manager.gschema.migrate
+++ b/data/org.gnome.power-manager.gschema.migrate
@@ -7,11 +7,7 @@ action-critical-ups = /apps/gnome-power-manager/actions/critical_ups
action-low-ups = /apps/gnome-power-manager/actions/low_ups
backlight-enable = /apps/gnome-power-manager/backlight/enable
backlight-battery-reduce = /apps/gnome-power-manager/backlight/battery_reduce
-idle-brightness = /apps/gnome-power-manager/backlight/idle_brightness
-idle-dim-battery = /apps/gnome-power-manager/backlight/idle_dim_battery
-idle-dim-time = /apps/gnome-power-manager/backlight/idle_dim_time
brightness-dim-battery = /apps/gnome-power-manager/backlight/brightness_dim_battery
-idle-dim-ac = /apps/gnome-power-manager/backlight/idle_dim_ac
dpms-method-ac = /apps/gnome-power-manager/backlight/dpms_method_ac
dpms-method-battery = /apps/gnome-power-manager/backlight/dpms_method_battery
brightness-ac" = /apps/gnome-power-manager/backlight/brightness_ac
@@ -54,8 +50,6 @@ time-action = /apps/gnome-power-manager/thresholds/time_action
sleep-computer-battery = /apps/gnome-power-manager/timeout/sleep_computer_battery
sleep-computer-ac = /apps/gnome-power-manager/timeout/sleep_computer_ac
sleep-computer-ups = /apps/gnome-power-manager/timeout/sleep_computer_ups
-sleep-display-ac = /apps/gnome-power-manager/timeout/sleep_display_ac
-sleep-display-battery = /apps/gnome-power-manager/timeout/sleep_display_battery
sleep-display-ups = /apps/gnome-power-manager/timeout/sleep_display_ups
enable-sound = /apps/gnome-power-manager/ui/enable_sound
show-actions = /apps/gnome-power-manager/ui/show_actions
diff --git a/data/org.gnome.power-manager.gschema.xml b/data/org.gnome.power-manager.gschema.xml
index 797321b..b2dca23 100644
--- a/data/org.gnome.power-manager.gschema.xml
+++ b/data/org.gnome.power-manager.gschema.xml
@@ -60,31 +60,11 @@
<summary>Reduce the backlight brightness when on battery power</summary>
<description>If the screen should be reduced in brightness when the computer is on battery power.</description>
</key>
- <key name="idle-brightness" type="i">
- <default>30</default>
- <summary>The brightness of the screen when idle</summary>
- <description>This is the laptop panel screen brightness used when the session is idle. Only valid when use-time-for-policy is true.</description>
- </key>
- <key name="idle-dim-battery" type="b">
- <default>true</default>
- <summary>Dim the screen after a period of inactivity when on battery power</summary>
- <description>If the screen should be dimmed to save power when the computer is idle when on battery power.</description>
- </key>
- <key name="idle-dim-time" type="i">
- <default>10</default>
- <summary>The default amount of time to dim the screen after idle</summary>
- <description>The default amount of time to dim the screen after idle.</description>
- </key>
<key name="brightness-dim-battery" type="i">
<default>50</default>
<summary>LCD dimming amount when on battery</summary>
<description>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100.</description>
</key>
- <key name="idle-dim-ac" type="b">
- <default>false</default>
- <summary>Dim the screen after a period of inactivity when on AC power</summary>
- <description>If the screen should be dimmed to save power when the computer is idle when on AC power.</description>
- </key>
<key name="dpms-method-ac" enum="org.gnome.power-manager.DpmsMethod">
<default>'off'</default>
<summary>Method used to blank screen on AC</summary>
@@ -325,16 +305,6 @@
<summary>Sleep timeout computer when on UPS</summary>
<description>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</description>
</key>
- <key name="sleep-display-ac" type="i">
- <default>1800</default>
- <summary>Sleep timeout display when on AC</summary>
- <description>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</description>
- </key>
- <key name="sleep-display-battery" type="i">
- <default>600</default>
- <summary>Sleep timeout display when on battery</summary>
- <description>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep.</description>
- </key>
<key name="sleep-display-ups" type="i">
<default>600</default>
<summary>Sleep timeout display when on UPS</summary>
diff --git a/src/cc-power-panel.c b/src/cc-power-panel.c
index 1fcba34..ac2f240 100644
--- a/src/cc-power-panel.c
+++ b/src/cc-power-panel.c
@@ -65,15 +65,6 @@ cc_power_panel_help_cb (GtkWidget *widget, CcPowerPanel *panel)
}
/**
- * cc_power_panel_format_percentage_cb:
- **/
-static gchar *
-cc_power_panel_format_percentage_cb (GtkScale *scale, gdouble value)
-{
- return g_strdup_printf ("%.0f%%", value * 100.0f);
-}
-
-/**
* cc_power_panel_action_combo_changed_cb:
**/
static void
@@ -300,40 +291,15 @@ cc_power_panel_setup_ac (CcPowerPanel *panel)
2*60*60,
0, /* never */
-1};
- static const gint display_times[] =
- {1*60,
- 5*60,
- 10*60,
- 30*60,
- 1*60*60,
- 0, /* never */
- -1};
cc_power_panel_setup_time_combo (panel, "combobox_ac_computer",
GPM_SETTINGS_SLEEP_COMPUTER_AC,
computer_times);
- cc_power_panel_setup_time_combo (panel, "combobox_ac_display",
- GPM_SETTINGS_SLEEP_DISPLAY_AC,
- display_times);
cc_power_panel_setup_action_combo (panel, "combobox_ac_lid",
GPM_SETTINGS_BUTTON_LID_AC,
button_lid_actions);
- /* setup brightness slider */
-// widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_ac_brightness"));
-// g_settings_bind (panel->priv->settings, GPM_SETTINGS_BRIGHTNESS_AC,
-// widget, "fill-level",
-// G_SETTINGS_BIND_DEFAULT);
-if(0) g_signal_connect (G_OBJECT (widget), "format-value",
- G_CALLBACK (cc_power_panel_format_percentage_cb), NULL);
-
- /* set up the checkboxes */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "checkbutton_ac_display_dim"));
- g_settings_bind (panel->priv->settings, GPM_SETTINGS_IDLE_DIM_AC,
- widget, "active",
- G_SETTINGS_BIND_DEFAULT);
-
if (panel->priv->has_button_lid == FALSE) {
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_ac_lid"));
gtk_widget_hide (widget);
@@ -377,21 +343,10 @@ cc_power_panel_setup_battery (CcPowerPanel *panel)
2*60*60,
0, /* never */
-1};
- static const gint display_times[] =
- {1*60,
- 5*60,
- 10*60,
- 30*60,
- 1*60*60,
- 0, /* never */
- -1};
cc_power_panel_setup_time_combo (panel, "combobox_battery_computer",
GPM_SETTINGS_SLEEP_COMPUTER_BATT,
computer_times);
- cc_power_panel_setup_time_combo (panel, "combobox_battery_display",
- GPM_SETTINGS_SLEEP_DISPLAY_BATT,
- display_times);
if (panel->priv->has_batteries == FALSE) {
notebook = GTK_NOTEBOOK (gtk_builder_get_object (panel->priv->builder, "notebook_preferences"));
@@ -408,16 +363,6 @@ cc_power_panel_setup_battery (CcPowerPanel *panel)
GPM_SETTINGS_ACTION_CRITICAL_BATT,
battery_critical_actions);
- /* set up the checkboxes */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "checkbutton_battery_display_reduce"));
- g_settings_bind (panel->priv->settings, GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE,
- widget, "active",
- G_SETTINGS_BIND_DEFAULT);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "checkbutton_battery_display_dim"));
- g_settings_bind (panel->priv->settings, GPM_SETTINGS_IDLE_DIM_BATT,
- widget, "active",
- G_SETTINGS_BIND_DEFAULT);
-
if (panel->priv->has_button_lid == FALSE) {
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_battery_lid"));
gtk_widget_hide (widget);
@@ -451,21 +396,10 @@ cc_power_panel_setup_ups (CcPowerPanel *panel)
2*60*60,
0, /* never */
-1};
- static const gint display_times[] =
- {1*60,
- 5*60,
- 10*60,
- 30*60,
- 1*60*60,
- 0, /* never */
- -1};
cc_power_panel_setup_time_combo (panel, "combobox_ups_computer",
GPM_SETTINGS_SLEEP_COMPUTER_UPS,
computer_times);
- cc_power_panel_setup_time_combo (panel, "combobox_ups_display",
- GPM_SETTINGS_SLEEP_DISPLAY_UPS,
- display_times);
if (panel->priv->has_ups == FALSE) {
notebook = GTK_NOTEBOOK (gtk_builder_get_object (panel->priv->builder, "notebook_preferences"));
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
index de14e42..6beefe6 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -76,6 +76,7 @@ struct GpmBacklightPrivate
GpmBrightness *brightness;
GpmButton *button;
GSettings *settings;
+ GSettings *settings_gsd;
GtkWidget *popup;
GpmControl *control;
GpmDpms *dpms;
@@ -335,11 +336,11 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
/* reduce if system is momentarily idle */
if (!on_battery)
- enable_action = g_settings_get_boolean (backlight->priv->settings, GPM_SETTINGS_IDLE_DIM_AC);
+ enable_action = g_settings_get_boolean (backlight->priv->settings_gsd, GSD_SETTINGS_IDLE_DIM_AC);
else
- enable_action = g_settings_get_boolean (backlight->priv->settings, GPM_SETTINGS_IDLE_DIM_BATT);
+ enable_action = g_settings_get_boolean (backlight->priv->settings_gsd, GSD_SETTINGS_IDLE_DIM_BATT);
if (enable_action && backlight->priv->system_is_idle) {
- value = g_settings_get_int (backlight->priv->settings, GPM_SETTINGS_IDLE_BRIGHTNESS);
+ value = g_settings_get_int (backlight->priv->settings_gsd, GSD_SETTINGS_IDLE_BRIGHTNESS);
if (value > 100) {
g_warning ("cannot use idle brightness value %i, correcting to 50", value);
value = 50;
@@ -400,14 +401,14 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight
} else if (on_battery && g_strcmp0 (key, GPM_SETTINGS_BRIGHTNESS_DIM_BATT) == 0) {
gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
- } else if (g_strcmp0 (key, GPM_SETTINGS_IDLE_DIM_AC) == 0 ||
+ } else if (g_strcmp0 (key, GSD_SETTINGS_IDLE_DIM_AC) == 0 ||
g_strcmp0 (key, GPM_SETTINGS_BACKLIGHT_ENABLE) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_SLEEP_DISPLAY_BATT) == 0 ||
+ g_strcmp0 (key, GSD_SETTINGS_SLEEP_DISPLAY_BATT) == 0 ||
g_strcmp0 (key, GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_IDLE_BRIGHTNESS) == 0) {
+ g_strcmp0 (key, GSD_SETTINGS_IDLE_BRIGHTNESS) == 0) {
gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
- } else if (g_strcmp0 (key, GPM_SETTINGS_IDLE_DIM_TIME) == 0) {
+ } else if (g_strcmp0 (key, GSD_SETTINGS_IDLE_DIM_TIME) == 0) {
backlight->priv->idle_dim_timeout = g_settings_get_int (settings, key);
gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
} else {
@@ -530,8 +531,8 @@ gpm_backlight_notify_system_idle_changed (GpmBacklight *backlight, gboolean is_i
if (elapsed > 2*60) {
/* reset back to our default dimming */
backlight->priv->idle_dim_timeout =
- g_settings_get_int (backlight->priv->settings,
- GPM_SETTINGS_IDLE_DIM_TIME);
+ g_settings_get_int (backlight->priv->settings_gsd,
+ GSD_SETTINGS_IDLE_DIM_TIME);
g_debug ("resetting idle dim time to %is", backlight->priv->idle_dim_timeout);
gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
}
@@ -800,6 +801,7 @@ gpm_backlight_finalize (GObject *object)
g_object_unref (backlight->priv->dpms);
g_object_unref (backlight->priv->control);
g_object_unref (backlight->priv->settings);
+ g_object_unref (backlight->priv->settings_gsd);
g_object_unref (backlight->priv->client);
g_object_unref (backlight->priv->button);
g_object_unref (backlight->priv->idle);
@@ -863,6 +865,8 @@ gpm_backlight_init (GpmBacklight *backlight)
/* watch for dim value changes */
backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
+ backlight->priv->settings_gsd = g_settings_new (GSD_SETTINGS_SCHEMA);
+ g_signal_connect (backlight->priv->settings_gsd, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
/* set the main brightness, this is designed to be updated if the user changes the
* brightness so we can undim to the 'correct' value */
@@ -880,7 +884,7 @@ gpm_backlight_init (GpmBacklight *backlight)
/* assumption */
backlight->priv->system_is_idle = FALSE;
- backlight->priv->idle_dim_timeout = g_settings_get_int (backlight->priv->settings, GPM_SETTINGS_IDLE_DIM_TIME);
+ backlight->priv->idle_dim_timeout = g_settings_get_int (backlight->priv->settings_gsd, GSD_SETTINGS_IDLE_DIM_TIME);
gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
/* use a visual widget */
diff --git a/src/gpm-common.h b/src/gpm-common.h
index e03a084..08b9cd7 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -44,6 +44,7 @@ G_BEGIN_DECLS
/* change general/installed_schema whenever adding or moving keys */
#define GPM_SETTINGS_SCHEMA_ID 3
#define GPM_SETTINGS_SCHEMA "org.gnome.power-manager"
+#define GSD_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.power"
/* actions */
#define GPM_SETTINGS_ACTION_CRITICAL_UPS "action-critical-ups"
@@ -58,10 +59,10 @@ G_BEGIN_DECLS
#define GPM_SETTINGS_BACKLIGHT_BATTERY_REDUCE "backlight-battery-reduce"
#define GPM_SETTINGS_DPMS_METHOD_AC "dpms-method-ac"
#define GPM_SETTINGS_DPMS_METHOD_BATT "dpms-method-battery"
-#define GPM_SETTINGS_IDLE_BRIGHTNESS "idle-brightness"
-#define GPM_SETTINGS_IDLE_DIM_AC "idle-dim-ac"
-#define GPM_SETTINGS_IDLE_DIM_BATT "idle-dim-battery"
-#define GPM_SETTINGS_IDLE_DIM_TIME "idle-dim-time"
+#define GSD_SETTINGS_IDLE_BRIGHTNESS "idle-brightness"
+#define GSD_SETTINGS_IDLE_DIM_AC "idle-dim-ac"
+#define GSD_SETTINGS_IDLE_DIM_BATT "idle-dim-battery"
+#define GSD_SETTINGS_IDLE_DIM_TIME "idle-dim-time"
#define GPM_SETTINGS_BRIGHTNESS_AC "brightness-ac"
#define GPM_SETTINGS_BRIGHTNESS_DIM_BATT "brightness-dim-battery"
@@ -115,8 +116,8 @@ G_BEGIN_DECLS
#define GPM_SETTINGS_SLEEP_COMPUTER_AC "sleep-computer-ac"
#define GPM_SETTINGS_SLEEP_COMPUTER_BATT "sleep-computer-battery"
#define GPM_SETTINGS_SLEEP_COMPUTER_UPS "sleep-computer-ups"
-#define GPM_SETTINGS_SLEEP_DISPLAY_AC "sleep-display-ac"
-#define GPM_SETTINGS_SLEEP_DISPLAY_BATT "sleep-display-battery"
+#define GSD_SETTINGS_SLEEP_DISPLAY_AC "sleep-display-ac"
+#define GSD_SETTINGS_SLEEP_DISPLAY_BATT "sleep-display-battery"
#define GPM_SETTINGS_SLEEP_DISPLAY_UPS "sleep-display-ups"
/* ui */
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 8b888ca..1af548a 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -89,6 +89,7 @@ struct GpmManagerPrivate
{
GpmButton *button;
GSettings *settings;
+ GSettings *settings_gsd;
GpmDisks *disks;
GpmDpms *dpms;
GpmIdle *idle;
@@ -371,10 +372,10 @@ gpm_manager_sync_policy_sleep (GpmManager *manager)
if (!manager->priv->on_battery) {
sleep_computer = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SLEEP_COMPUTER_AC);
- sleep_display = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SLEEP_DISPLAY_AC);
+ sleep_display = g_settings_get_int (manager->priv->settings_gsd, GSD_SETTINGS_SLEEP_DISPLAY_AC);
} else {
sleep_computer = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SLEEP_COMPUTER_BATT);
- sleep_display = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SLEEP_DISPLAY_BATT);
+ sleep_display = g_settings_get_int (manager->priv->settings_gsd, GSD_SETTINGS_SLEEP_DISPLAY_BATT);
}
/* set the new sleep (inactivity) value */
@@ -1169,8 +1170,8 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag
{
if (g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_BATT) == 0 ||
g_strcmp0 (key, GPM_SETTINGS_SLEEP_COMPUTER_AC) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_SLEEP_DISPLAY_BATT) == 0 ||
- g_strcmp0 (key, GPM_SETTINGS_SLEEP_DISPLAY_AC) == 0)
+ g_strcmp0 (key, GSD_SETTINGS_SLEEP_DISPLAY_BATT) == 0 ||
+ g_strcmp0 (key, GSD_SETTINGS_SLEEP_DISPLAY_AC) == 0)
gpm_manager_sync_policy_sleep (manager);
}
@@ -2242,6 +2243,9 @@ gpm_manager_init (GpmManager *manager)
manager->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
g_signal_connect (manager->priv->settings, "changed",
G_CALLBACK (gpm_manager_settings_changed_cb), manager);
+ manager->priv->settings_gsd = g_settings_new (GSD_SETTINGS_SCHEMA);
+ g_signal_connect (manager->priv->settings_gsd, "changed",
+ G_CALLBACK (gpm_manager_settings_changed_cb), manager);
manager->priv->client = up_client_new ();
g_signal_connect (manager->priv->client, "changed",
G_CALLBACK (gpm_manager_client_changed_cb), manager);
@@ -2378,6 +2382,7 @@ gpm_manager_finalize (GObject *object)
g_source_remove (manager->priv->critical_alert_timeout_id);
g_object_unref (manager->priv->settings);
+ g_object_unref (manager->priv->settings_gsd);
g_object_unref (manager->priv->disks);
g_object_unref (manager->priv->dpms);
g_object_unref (manager->priv->idle);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
