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 fe909f6b58a7654e67f39f3030c767cdef867dd9 Author: Sean Davis <smd.seanda...@gmail.com> Date: Sun Nov 11 16:27:22 2018 -0500 Rename /kbd/* parameters to /xkb/* --- src/gs-prefs.c | 3 --- src/xfcekbd-config-private.h | 12 ++++++------ src/xfcekbd-desktop-config.h | 1 - src/xfcekbd-indicator-config.c | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/gs-prefs.c b/src/gs-prefs.c index e1019d8..a6ed46e 100644 --- a/src/gs-prefs.c +++ b/src/gs-prefs.c @@ -404,9 +404,6 @@ key_changed_cb (XfconfChannel *channel, enabled = xfconf_channel_get_bool (channel, property, DEFAULT_KEY_USER_SWITCH_ENABLED); _gs_prefs_set_user_switch_enabled (prefs, enabled); - - } else { - g_warning ("Config key not handled: %s", property); } g_signal_emit (prefs, signals[CHANGED], 0); diff --git a/src/xfcekbd-config-private.h b/src/xfcekbd-config-private.h index 1ced19c..90ed505 100644 --- a/src/xfcekbd-config-private.h +++ b/src/xfcekbd-config-private.h @@ -29,33 +29,33 @@ /** * KBD/General: Default group, assigned on window creation */ -#define KEY_KBD_DEFAULT_GROUP "/kbd/general/default-group" +#define KEY_KBD_DEFAULT_GROUP "/xkb/default-group" #define DEFAULT_KEY_KBD_DEFAULT_GROUP -1 /** * KBD/General: Keep and manage separate group per window */ -#define KEY_KBD_GROUP_PER_WINDOW "/kbd/general/group-per-window" +#define KEY_KBD_GROUP_PER_WINDOW "/xkb/group-per-window" #define DEFAULT_KEY_KBD_GROUP_PER_WINDOW TRUE /** * KBD/General: Save/restore indicators together with layout groups */ -#define KEY_KBD_HANDLE_INDICATORS "/kbd/general/handle-indicators" +#define KEY_KBD_HANDLE_INDICATORS "/xkb/handle-indicators" #define DEFAULT_KEY_KBD_HANDLE_INDICATORS FALSE /** * KBD/General: Load extra configuration items * Load exotic, rarely used layouts and options */ -#define KEY_KBD_LOAD_EXTRA_ITEMS "/kbd/general/load-extra-items" +#define KEY_KBD_LOAD_EXTRA_ITEMS "/xkb/load-extra-items" #define DEFAULT_KEY_KBD_LOAD_EXTRA_ITEMS FALSE /** * KBD/Indicator: Secondary groups */ -#define KEY_KBD_INDICATOR_SECONDARIES "/kbd/indicator/secondary" -#define DEFAULT_KEY_KBD_INDICATOR_SECONDARIES 0 +#define KEY_KBD_SECONDARY_GROUPS "/xkb/secondary-groups" +#define DEFAULT_KEY_KBD_SECONDARY_GROUPS 0 /** * General config functions (private) diff --git a/src/xfcekbd-desktop-config.h b/src/xfcekbd-desktop-config.h index dc3a6c7..7910c4a 100644 --- a/src/xfcekbd-desktop-config.h +++ b/src/xfcekbd-desktop-config.h @@ -36,7 +36,6 @@ struct _XfcekbdDesktopConfig { gint default_group; gboolean group_per_app; gboolean handle_indicators; - gboolean layout_names_as_group_names; gboolean load_extra_items; /* private, transient */ diff --git a/src/xfcekbd-indicator-config.c b/src/xfcekbd-indicator-config.c index 0c37f6e..b22d03b 100644 --- a/src/xfcekbd-indicator-config.c +++ b/src/xfcekbd-indicator-config.c @@ -58,8 +58,8 @@ void xfcekbd_indicator_config_load_from_xfconf (XfcekbdIndicatorConfig * ind_config) { ind_config->secondary_groups_mask = xfconf_channel_get_int (ind_config->channel, - KEY_KBD_INDICATOR_SECONDARIES, - DEFAULT_KEY_KBD_INDICATOR_SECONDARIES); + KEY_KBD_SECONDARY_GROUPS, + DEFAULT_KEY_KBD_SECONDARY_GROUPS); } void -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits