[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Rename preferences and update widget IDs for easier maintenance

noreply at xfce.org noreply at xfce.org
Sun Nov 18 18:59:54 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 dd373cce4e800a32ad186e86123941cae9eb2a25
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Nov 18 12:59:49 2018 -0500

    Rename preferences and update widget IDs for easier maintenance
---
 src/gs-prefs.h                       |  60 ++++++++--------
 src/xfce4-screensaver-preferences.c  | 128 +++++++++++++++++------------------
 src/xfce4-screensaver-preferences.ui |  76 ++++++++++-----------
 3 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/src/gs-prefs.h b/src/gs-prefs.h
index 14fa4a7..6683d55 100644
--- a/src/gs-prefs.h
+++ b/src/gs-prefs.h
@@ -44,50 +44,58 @@ G_BEGIN_DECLS
  * theme on activation (specified in "themes" key), and "random" to enable the screensaver
  * using a random theme on activation.
  */
-#define KEY_MODE "/mode"
+#define KEY_MODE "/saver/mode"
 #define DEFAULT_KEY_MODE 0
 
 /**
+ * Activate when idle
+ * Set this to TRUE to activate the screensaver when the session is idle.
+ */
+#define KEY_IDLE_ACTIVATION_ENABLED "/saver/idle-activation/enabled"
+#define DEFAULT_KEY_IDLE_ACTIVATION_ENABLED TRUE
+
+/**
  * Time before session is considered idle
  * The number of minutes of inactivity before the session is considered idle.
  */
-#define KEY_IDLE_DELAY "/idle-delay"
+#define KEY_IDLE_DELAY "/saver/idle-activation/delay"
 #define DEFAULT_KEY_IDLE_DELAY 5
 
 /**
- * Time before locking
- * The number of minutes after screensaver activation before locking the screen.
+ * Screensaver themes
+ * This key specifies the list of themes to be used by the screensaver. It's ignored
+ * when "mode" key is "blank-only", should provide the theme name when "mode" is "single",
+ * and should provide a list of themes when "mode" is "random".
  */
-#define KEY_LOCK_DELAY "/lock-delay"
-#define DEFAULT_KEY_LOCK_DELAY 0
+#define KEY_THEMES "/saver/themes/list"
 
 /**
- * Activate when idle
- * Set this to TRUE to activate the screensaver when the session is idle.
+ * Time before theme change
+ * The number of minutes to run before changing the screensaver theme.
  */
-#define KEY_IDLE_ACTIVATION_ENABLED "/idle-activation-enabled"
-#define DEFAULT_KEY_IDLE_ACTIVATION_ENABLED TRUE
+#define KEY_CYCLE_DELAY "/saver/themes/cycle-delay"
+#define DEFAULT_KEY_CYCLE_DELAY 10
 
 /**
  * Lock on activation
  * Set this to TRUE to lock the screen when the screensaver goes active.
  */
-#define KEY_LOCK_ENABLED "/lock-enabled"
+#define KEY_LOCK_ENABLED "/lock/saver-activation/enabled"
 #define DEFAULT_KEY_LOCK_ENABLED TRUE
 
 /**
- * Time before theme change
- * The number of minutes to run before changing the screensaver theme.
+ * Time before locking
+ * The number of minutes after screensaver activation before locking the screen.
  */
-#define KEY_CYCLE_DELAY "/cycle-delay"
-#define DEFAULT_KEY_CYCLE_DELAY 10
+#define KEY_LOCK_DELAY "/lock/saver-activation/delay"
+#define DEFAULT_KEY_LOCK_DELAY 0
 
 /**
  * Allow embedding a keyboard into the window
  * Set this to TRUE to allow embedding a keyboard into the window when trying to unlock.
  * The "keyboard_command" key must be set with the appropriate command.
  */
-#define KEY_KEYBOARD_ENABLED "/embedded-keyboard-enabled"
+#define KEY_KEYBOARD_ENABLED "/lock/embedded-keyboard/enabled"
 #define DEFAULT_KEY_KEYBOARD_ENABLED FALSE
 
 /**
@@ -96,14 +104,14 @@ G_BEGIN_DECLS
  * to embed a keyboard widget into the window. This command should implement an XEMBED
  * plug interface and output a window XID on the standard output.
  */
-#define KEY_KEYBOARD_COMMAND "/embedded-keyboard-command"
+#define KEY_KEYBOARD_COMMAND "/lock/embedded-keyboard/command"
 #define DEFAULT_KEY_KEYBOARD_COMMAND ""
 
 /**
  * Allow the session status message to be displayed
  * Allow the session status message to be displayed when the screen is locked.
  */
-#define KEY_STATUS_MESSAGE_ENABLED "/status-message-enabled"
+#define KEY_STATUS_MESSAGE_ENABLED "/lock/status-messages/enabled"
 #define DEFAULT_KEY_STATUS_MESSAGE_ENABLED TRUE
 
 /**
@@ -111,7 +119,7 @@ G_BEGIN_DECLS
  * Set this to TRUE to offer an option in the unlock dialog to allow logging out after a
  * delay. The delay is specified in the "logout_delay" key.
  */
-#define KEY_LOGOUT_ENABLED "/logout-enabled"
+#define KEY_LOGOUT_ENABLED "/lock/logout/enabled"
 #define DEFAULT_KEY_LOGOUT_ENABLED FALSE
 
 /**
@@ -120,7 +128,7 @@ G_BEGIN_DECLS
  * appear in the unlock dialog. This key has effect only if the "logout_enable" key is
  * set to TRUE.
  */
-#define KEY_LOGOUT_DELAY "/logout-delay"
+#define KEY_LOGOUT_DELAY "/lock/logout/delay"
 #define DEFAULT_KEY_LOGOUT_DELAY 120
 
 /**
@@ -129,7 +137,7 @@ G_BEGIN_DECLS
  * log the user out without any interaction. This key has effect only if the
  * "logout_enable" key is set to TRUE.
  */
-#define KEY_LOGOUT_COMMAND "/logout-command"
+#define KEY_LOGOUT_COMMAND "/lock/logout/command"
 #define DEFAULT_KEY_LOGOUT_COMMAND ""
 
 /**
@@ -137,17 +145,9 @@ G_BEGIN_DECLS
  * Set this to TRUE to offer an option in the unlock dialog to switch to a different
  * user account.
  */
-#define KEY_USER_SWITCH_ENABLED "/user-switch-enabled"
+#define KEY_USER_SWITCH_ENABLED "/lock/user-switching/enabled"
 #define DEFAULT_KEY_USER_SWITCH_ENABLED TRUE
 
-/**
- * Screensaver themes
- * This key specifies the list of themes to be used by the screensaver. It's ignored
- * when "mode" key is "blank-only", should provide the theme name when "mode" is "single",
- * and should provide a list of themes when "mode" is "random".
- */
-#define KEY_THEMES "/themes"
-
 typedef enum
 {
     GS_MODE_BLANK_ONLY,
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 100f129..382c7a0 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -194,11 +194,11 @@ static void
 config_set_mode (int mode) {
     xfconf_channel_set_int (screensaver_channel, KEY_MODE, mode);
 
-    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "cycle_delay_label_left")),
+    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_cycle_delay_label_left")),
                             mode == GS_MODE_RANDOM);
-    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "cycle_delay")),
+    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_cycle_delay")),
                             mode == GS_MODE_RANDOM);
-    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "cycle_delay_label_right")),
+    gtk_widget_set_visible (GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_cycle_delay_label_right")),
                             mode == GS_MODE_RANDOM);
 }
 
@@ -930,7 +930,7 @@ reload_themes (void) {
     GtkWidget    *treeview;
     GtkTreeModel *model;
 
-    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
     gtk_tree_store_clear (GTK_TREE_STORE (model));
     populate_model (GTK_TREE_STORE (model));
@@ -1073,9 +1073,9 @@ lock_toggled_cb (GtkSwitch *widget, gpointer user_data) {
     config_set_lock_enabled (gtk_switch_get_active (widget));
 
     writable = lock_delay_writable && gtk_switch_get_active (widget);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay_label_right")), writable);
 }
 
 static void
@@ -1085,9 +1085,9 @@ idle_activation_toggled_cb (GtkSwitch *widget, gpointer user_data) {
     config_set_idle_activation_enabled (gtk_switch_get_active (widget));
 
     writable = idle_delay_writable && gtk_switch_get_active (widget);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay_label_right")), writable);
 }
 
 static void
@@ -1097,13 +1097,13 @@ logout_toggled_cb (GtkSwitch *widget, gpointer user_data) {
     config_set_logout_enabled (gtk_switch_get_active (widget));
 
     writable = logout_command_writable && gtk_switch_get_active (widget);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_command_label")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_command")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command_label")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command")), writable);
 
     writable = logout_delay_writable && gtk_switch_get_active (widget);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay_label_right")), writable);
 }
 
 static void
@@ -1123,8 +1123,8 @@ keyboard_toggled_cb (GtkSwitch *widget, gpointer user_data) {
     config_set_keyboard_enabled (gtk_switch_get_active (widget));
 
     writable = keyboard_command_writable && gtk_switch_get_active (widget);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command_label")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command_label")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command")), writable);
 }
 
 static void
@@ -1133,7 +1133,7 @@ ui_set_lock_enabled (gboolean enabled) {
     gboolean   active;
     gboolean   writable;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_enabled"));
 
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
@@ -1141,9 +1141,9 @@ ui_set_lock_enabled (gboolean enabled) {
     }
 
     writable = lock_delay_writable && enabled;
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay_label_right")), writable);
 }
 
 static void
@@ -1152,16 +1152,16 @@ ui_set_idle_activation_enabled (gboolean enabled) {
     gboolean   active;
     gboolean   writable;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "idle_activation_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_enabled"));
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
         gtk_switch_set_active (GTK_SWITCH (widget), enabled);
     }
 
     writable = idle_delay_writable && enabled;
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay_label_right")), writable);
 }
 
 static void
@@ -1170,7 +1170,7 @@ ui_set_keyboard_enabled (gboolean enabled) {
     gboolean   active;
     gboolean   writable;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_enabled"));
 
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
@@ -1178,8 +1178,8 @@ ui_set_keyboard_enabled (gboolean enabled) {
     }
 
     writable = keyboard_command_writable && enabled;
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command_label")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command_label")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command")), writable);
 }
 
 static void
@@ -1188,7 +1188,7 @@ ui_set_logout_enabled (gboolean enabled) {
     gboolean   active;
     gboolean   writable;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_enabled"));
 
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
@@ -1196,20 +1196,20 @@ ui_set_logout_enabled (gboolean enabled) {
     }
 
     writable = logout_command_writable && enabled;
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_command_label")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_command")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command_label")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command")), writable);
 
     writable = logout_delay_writable && enabled;
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay_label_left")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay")), writable);
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay_label_right")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay_label_left")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay")), writable);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay_label_right")), writable);
 }
 
 static void
 ui_set_idle_delay (int delay) {
     GtkWidget *widget;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay"));
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), delay);
 }
 
@@ -1217,7 +1217,7 @@ static void
 ui_set_lock_delay (int delay) {
     GtkWidget *widget;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay"));
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), delay);
 }
 
@@ -1225,7 +1225,7 @@ static void
 ui_set_cycle_delay (int delay) {
     GtkWidget *widget;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_cycle_delay"));
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), delay);
 }
 
@@ -1234,7 +1234,7 @@ ui_set_keyboard_command (gchar *command) {
     GtkWidget   *widget;
     const gchar *current;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command"));
 
     current = gtk_entry_get_text (GTK_ENTRY (widget));
     if (g_strcmp0 (current, command) != 0) {
@@ -1247,7 +1247,7 @@ ui_set_status_message_enabled (gboolean enabled) {
     GtkWidget *widget;
     gboolean   active;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "status_message_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_status_messages_enabled"));
 
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
@@ -1259,7 +1259,7 @@ static void
 ui_set_logout_delay (int delay) {
     GtkWidget *widget;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay"));
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), delay);
 }
 
@@ -1268,7 +1268,7 @@ ui_set_logout_command (gchar *command) {
     GtkWidget   *widget;
     const gchar *current;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_command"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command"));
 
     current = gtk_entry_get_text (GTK_ENTRY (widget));
     if (g_strcmp0 (current, command) != 0) {
@@ -1281,7 +1281,7 @@ ui_set_user_switch_enabled (gboolean enabled) {
     GtkWidget *widget;
     gboolean   active;
 
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "user_switch_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_user_switching_enabled"));
 
     active = gtk_switch_get_active (GTK_SWITCH (widget));
     if (active != enabled) {
@@ -1341,7 +1341,7 @@ key_changed_cb (XfconfChannel *channel, const gchar *key, gpointer data) {
         ui_set_user_switch_enabled (enabled);
     } else if (strcmp (key, KEY_THEMES) == 0) {
         GtkWidget *treeview;
-        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
         setup_treeview_selection (treeview);
     }
 }
@@ -1352,7 +1352,7 @@ fullscreen_preview_previous_cb (GtkWidget *fullscreen_preview_window,
     GtkWidget        *treeview;
     GtkTreeSelection *selection;
 
-    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
     tree_selection_previous (selection);
 }
@@ -1363,7 +1363,7 @@ fullscreen_preview_next_cb (GtkWidget *fullscreen_preview_window,
     GtkWidget        *treeview;
     GtkTreeSelection *selection;
 
-    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
     tree_selection_next (selection);
 }
@@ -1376,7 +1376,7 @@ fullscreen_preview_cancelled_cb (GtkWidget *button,
     GtkWidget *preview_area;
     GtkWidget *dialog;
 
-    preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+    preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_preview_area"));
     gs_job_set_widget (job, preview_area);
 
     fullscreen_preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
@@ -1464,7 +1464,7 @@ setup_for_root_user (void) {
     GtkWidget *lock_checkbox;
     GtkWidget *infobar;
 
-    lock_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "lock_enabled"));
+    lock_checkbox = GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_enabled"));
     infobar = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_infobar"));
     gtk_switch_set_active (GTK_SWITCH (lock_checkbox), FALSE);
     gtk_widget_set_sensitive (lock_checkbox, FALSE);
@@ -1653,8 +1653,8 @@ setup_treeview_idle (gpointer data) {
     GtkWidget *preview;
     GtkWidget *treeview;
 
-    preview  = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
-    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
+    preview  = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_preview_area"));
+    treeview = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
 
     setup_treeview (treeview, preview);
     setup_treeview_selection (treeview);
@@ -1730,11 +1730,11 @@ configure_capplet (void) {
         exit (1);
     }
 
-    preview                     = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area"));
+    preview                     = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_preview_area"));
     dialog                      = GTK_WIDGET (gtk_builder_get_object (builder, "prefs_dialog"));
     plug_child                  = GTK_WIDGET (gtk_builder_get_object (builder, "plug-child"));
-    treeview                    = GTK_WIDGET (gtk_builder_get_object (builder, "savers_treeview"));
-    list_scroller               = GTK_WIDGET (gtk_builder_get_object (builder, "themes_scrolled_window"));
+    treeview                    = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_treeview"));
+    list_scroller               = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_scrolled_window"));
     root_warning_infobar        = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_infobar"));
     preview_button              = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
     gpm_button                  = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
@@ -1759,7 +1759,7 @@ configure_capplet (void) {
                       NULL);
 
     /* Idle delay */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "idle_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_delay"));
     delay = config_get_idle_delay (&idle_delay_writable);
     ui_set_idle_delay (delay);
     set_widget_writable (widget, idle_delay_writable);
@@ -1767,7 +1767,7 @@ configure_capplet (void) {
                       G_CALLBACK (idle_delay_value_changed_cb), NULL);
 
     /* Lock delay */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_delay"));
     delay = config_get_lock_delay (&lock_delay_writable);
     ui_set_lock_delay (delay);
     set_widget_writable (widget, lock_delay_writable);
@@ -1775,7 +1775,7 @@ configure_capplet (void) {
                       G_CALLBACK (lock_delay_value_changed_cb), NULL);
 
     /* Keyboard command */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_command"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_command"));
     command = config_get_keyboard_command (&keyboard_command_writable);
     ui_set_keyboard_command (command);
     set_widget_writable (widget, keyboard_command_writable);
@@ -1784,7 +1784,7 @@ configure_capplet (void) {
     g_free (command);
 
     /* Logout command */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_command"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_command"));
     command = config_get_logout_command (&logout_command_writable);
     ui_set_logout_command (command);
     set_widget_writable (widget, logout_command_writable);
@@ -1793,7 +1793,7 @@ configure_capplet (void) {
     g_free (command);
 
     /* Logout delay */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_delay"));
     delay = config_get_logout_delay (&logout_delay_writable);
     ui_set_logout_delay (delay);
     set_widget_writable (widget, logout_delay_writable);
@@ -1801,7 +1801,7 @@ configure_capplet (void) {
                       G_CALLBACK (logout_delay_value_changed_cb), NULL);
 
     /* Idle activation enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "idle_activation_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_idle_activation_enabled"));
     enabled = config_get_idle_activation_enabled (&is_writable);
     ui_set_idle_activation_enabled (enabled);
     set_widget_writable (widget, is_writable);
@@ -1809,7 +1809,7 @@ configure_capplet (void) {
                       G_CALLBACK (idle_activation_toggled_cb), NULL);
 
     /* Lock enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_saver_activation_enabled"));
     enabled = config_get_lock_enabled (&is_writable);
     ui_set_lock_enabled (enabled);
     set_widget_writable (widget, is_writable);
@@ -1817,7 +1817,7 @@ configure_capplet (void) {
                       G_CALLBACK (lock_toggled_cb), NULL);
 
     /* Cycle delay */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_delay"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_cycle_delay"));
     delay = config_get_cycle_delay (&is_writable);
     ui_set_cycle_delay (delay);
     set_widget_writable (widget, is_writable);
@@ -1825,7 +1825,7 @@ configure_capplet (void) {
                       G_CALLBACK (cycle_delay_value_changed_cb), NULL);
 
     /* Keyboard enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_embedded_keyboard_enabled"));
     enabled = config_get_keyboard_enabled (&is_writable);
     ui_set_keyboard_enabled (enabled);
     set_widget_writable (widget, is_writable);
@@ -1833,7 +1833,7 @@ configure_capplet (void) {
                       G_CALLBACK (keyboard_toggled_cb), NULL);
 
     /* Status message enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "status_message_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_status_messages_enabled"));
     enabled = config_get_status_message_enabled (&is_writable);
     ui_set_status_message_enabled (enabled);
     set_widget_writable (widget, is_writable);
@@ -1841,7 +1841,7 @@ configure_capplet (void) {
                       G_CALLBACK (status_message_toggled_cb), NULL);
 
     /* Status message enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "logout_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_logout_enabled"));
     enabled = config_get_logout_enabled (&is_writable);
     ui_set_logout_enabled (enabled);
     set_widget_writable (widget, is_writable);
@@ -1849,7 +1849,7 @@ configure_capplet (void) {
                       G_CALLBACK (logout_toggled_cb), NULL);
 
     /* User switch enabled */
-    widget = GTK_WIDGET (gtk_builder_get_object (builder, "user_switch_enabled"));
+    widget = GTK_WIDGET (gtk_builder_get_object (builder, "lock_user_switching_enabled"));
     enabled = config_get_user_switch_enabled (&is_writable);
     ui_set_user_switch_enabled (enabled);
     set_widget_writable (widget, is_writable);
diff --git a/src/xfce4-screensaver-preferences.ui b/src/xfce4-screensaver-preferences.ui
index 5243146..251dc4c 100644
--- a/src/xfce4-screensaver-preferences.ui
+++ b/src/xfce4-screensaver-preferences.ui
@@ -26,7 +26,7 @@ Simon Steinbeiß
 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <requires lib="libxfce4ui-2" version="4.12.1"/>
+  <requires lib="libxfce4ui-2" version="4.12"/>
   <!-- interface-license-type gplv2 -->
   <!-- interface-name xfce4-screensaver -->
   <!-- interface-description screensaver preferences -->
@@ -573,14 +573,14 @@ Simon Steinbeiß
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkGrid" id="screensaver_grid">
+                      <object class="GtkGrid" id="saver_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="vexpand">True</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkGrid" id="grid1">
+                          <object class="GtkGrid" id="saver_themes_grid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">14</property>
@@ -589,14 +589,14 @@ Simon Steinbeiß
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="themes_scrolled_window">
+                              <object class="GtkScrolledWindow" id="saver_themes_scrolled_window">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="vexpand">True</property>
                                 <property name="hscrollbar_policy">never</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTreeView" id="savers_treeview">
+                                  <object class="GtkTreeView" id="saver_themes_treeview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
@@ -604,7 +604,7 @@ Simon Steinbeiß
                                       <object class="GtkTreeSelection"/>
                                     </child>
                                     <accessibility>
-                                      <relation type="label-for" target="savers_treeview"/>
+                                      <relation type="label-for" target="saver_themes_treeview"/>
                                     </accessibility>
                                   </object>
                                 </child>
@@ -615,7 +615,7 @@ Simon Steinbeiß
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkDrawingArea" id="preview_area">
+                              <object class="GtkDrawingArea" id="saver_themes_preview_area">
                                 <property name="app_paintable">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
@@ -628,7 +628,7 @@ Simon Steinbeiß
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel">
+                              <object class="GtkLabel" id="saver_themes_theme_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Theme</property>
@@ -644,7 +644,7 @@ Simon Steinbeiß
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel">
+                              <object class="GtkLabel" id="saver_themes_preview_label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Preview</property>
@@ -668,7 +668,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="cycle_delay_label_left">
+                          <object class="GtkLabel" id="saver_themes_cycle_delay_label_left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -681,7 +681,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="saver_idle_activation_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -697,7 +697,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="idle_activation_enabled">
+                          <object class="GtkSwitch" id="saver_idle_activation_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -711,7 +711,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="idle_delay_label_left">
+                          <object class="GtkLabel" id="saver_idle_activation_delay_label_left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
@@ -726,7 +726,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="cycle_delay">
+                          <object class="GtkSpinButton" id="saver_themes_cycle_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">cycle_delay_adj</property>
@@ -737,7 +737,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="idle_delay">
+                          <object class="GtkSpinButton" id="saver_idle_activation_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">idle_delay_adj</property>
@@ -748,7 +748,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="cycle_delay_label_right">
+                          <object class="GtkLabel" id="saver_themes_cycle_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">minutes</property>
@@ -762,7 +762,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="idle_delay_label_right">
+                          <object class="GtkLabel" id="saver_idle_activation_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">minutes</property>
@@ -844,13 +844,13 @@ Simon Steinbeiß
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkGrid" id="screenlocker_grid">
+                      <object class="GtkGrid" id="lock_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_status_messages_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -867,7 +867,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_user_switching_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -884,7 +884,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_logout_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -901,7 +901,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="logout_command_label">
+                          <object class="GtkLabel" id="lock_logout_command_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
@@ -914,7 +914,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="logout_delay_label_left">
+                          <object class="GtkLabel" id="lock_logout_delay_label_left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
@@ -927,7 +927,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="user_switch_enabled">
+                          <object class="GtkSwitch" id="lock_user_switching_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -940,7 +940,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="logout_enabled">
+                          <object class="GtkSwitch" id="lock_logout_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -953,7 +953,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="status_message_enabled">
+                          <object class="GtkSwitch" id="lock_status_messages_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -967,7 +967,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="logout_command">
+                          <object class="GtkEntry" id="lock_logout_command">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                           </object>
@@ -978,7 +978,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="logout_delay">
+                          <object class="GtkSpinButton" id="lock_logout_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">logout_delay_adj</property>
@@ -989,7 +989,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="logout_delay_label_right">
+                          <object class="GtkLabel" id="lock_logout_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">minutes</property>
@@ -1003,7 +1003,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_delay_label_right">
+                          <object class="GtkLabel" id="lock_saver_activation_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">minutes</property>
@@ -1017,7 +1017,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="lock_delay">
+                          <object class="GtkSpinButton" id="lock_saver_activation_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">lock_delay_adj</property>
@@ -1028,7 +1028,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_delay_label_left">
+                          <object class="GtkLabel" id="lock_saver_activation_delay_label_left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
@@ -1041,7 +1041,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="lock_enabled">
+                          <object class="GtkSwitch" id="lock_saver_activation_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -1054,7 +1054,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_saver_activation_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -1071,7 +1071,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_embedded_keyboard_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
@@ -1088,7 +1088,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="keyboard_enabled">
+                          <object class="GtkSwitch" id="lock_embedded_keyboard_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -1101,7 +1101,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="keyboard_command_label">
+                          <object class="GtkLabel" id="lock_embedded_keyboard_command_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
@@ -1114,7 +1114,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="keyboard_command">
+                          <object class="GtkEntry" id="lock_embedded_keyboard_command">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                           </object>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list