[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Fix various bugs related to preferences
noreply at xfce.org
noreply at xfce.org
Sun Nov 18 13:53:23 CET 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit dafa8ecc9d382ea56a4fdf1a4e6e79e57ea498c2
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Nov 18 07:53:18 2018 -0500
Fix various bugs related to preferences
---
src/xfce4-screensaver-preferences.c | 19 +++++++-----
src/xfce4-screensaver-preferences.ui | 58 ++++++++++++++++--------------------
2 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index e4b2637..100f129 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -118,8 +118,8 @@ config_get_lock_delay (gboolean *is_writable) {
delay = xfconf_channel_get_int (screensaver_channel, KEY_LOCK_DELAY, DEFAULT_KEY_LOCK_DELAY);
- if (delay < 1) {
- delay = 1;
+ if (delay < 0) {
+ delay = 0;
}
return delay;
@@ -282,11 +282,16 @@ config_set_theme (const char *theme_id) {
config_set_mode (mode);
- xfconf_channel_set_string_list (screensaver_channel,
- KEY_THEMES,
- (const gchar * const*) strv);
-
- g_strfreev (strv);
+ if (strv) {
+ xfconf_channel_set_string_list (screensaver_channel,
+ KEY_THEMES,
+ (const gchar * const*) strv);
+ g_strfreev (strv);
+ } else {
+ xfconf_channel_reset_property (screensaver_channel,
+ KEY_THEMES,
+ FALSE);
+ }
}
static gboolean
diff --git a/src/xfce4-screensaver-preferences.ui b/src/xfce4-screensaver-preferences.ui
index d68d548..5243146 100644
--- a/src/xfce4-screensaver-preferences.ui
+++ b/src/xfce4-screensaver-preferences.ui
@@ -26,42 +26,16 @@ Simon Steinbeiß
-->
<interface>
<requires lib="gtk+" version="3.20"/>
- <requires lib="libxfce4ui-2" version="4.13"/>
+ <requires lib="libxfce4ui-2" version="4.12.1"/>
<!-- interface-license-type gplv2 -->
<!-- interface-name xfce4-screensaver -->
<!-- interface-description screensaver preferences -->
<!-- interface-copyright 2018 Xfce Developers -->
<!-- interface-authors Wolfgang Ulbrich (MATE Screensaver)\nSean Davis\nSimon Steinbei\303\237 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">120</property>
- <property name="value">10</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
+ <object class="GtkAdjustment" id="cycle_delay_adj">
<property name="lower">1</property>
<property name="upper">1440</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="upper">100</property>
+ <property name="value">10</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -223,6 +197,24 @@ Simon Steinbeiß
</object>
</child>
</object>
+ <object class="GtkAdjustment" id="idle_delay_adj">
+ <property name="lower">1</property>
+ <property name="upper">1440</property>
+ <property name="value">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="lock_delay_adj">
+ <property name="upper">1440</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="logout_delay_adj">
+ <property name="upper">1440</property>
+ <property name="value">120</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkImage" id="power_image">
<property name="can_focus">False</property>
<property name="stock">gtk-jump-to</property>
@@ -737,7 +729,7 @@ Simon Steinbeiß
<object class="GtkSpinButton" id="cycle_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment5</property>
+ <property name="adjustment">cycle_delay_adj</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -748,7 +740,7 @@ Simon Steinbeiß
<object class="GtkSpinButton" id="idle_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment6</property>
+ <property name="adjustment">idle_delay_adj</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -989,7 +981,7 @@ Simon Steinbeiß
<object class="GtkSpinButton" id="logout_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment4</property>
+ <property name="adjustment">logout_delay_adj</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1028,7 +1020,7 @@ Simon Steinbeiß
<object class="GtkSpinButton" id="lock_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">adjustment3</property>
+ <property name="adjustment">lock_delay_adj</property>
</object>
<packing>
<property name="left_attach">1</property>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list