diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-25 00:38:52 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-25 00:38:52 +0200 |
| commit | 3bb2d6c2e4c434cd7852eddfac5256ad807f4da4 (patch) | |
| tree | 452af6284ea78095594a297132048d316e36488b /capplets/keyboard/mate-keyboard-properties-xkb.h | |
| parent | fdbdbecabce4115565a3beaeeb96486e1e5fdb28 (diff) | |
| download | mate-control-center-3bb2d6c2e4c434cd7852eddfac5256ad807f4da4.tar.bz2 mate-control-center-3bb2d6c2e4c434cd7852eddfac5256ad807f4da4.tar.xz | |
migrate keyboard applet to gsettings
Diffstat (limited to 'capplets/keyboard/mate-keyboard-properties-xkb.h')
| -rw-r--r-- | capplets/keyboard/mate-keyboard-properties-xkb.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/capplets/keyboard/mate-keyboard-properties-xkb.h b/capplets/keyboard/mate-keyboard-properties-xkb.h index 9ed7453c..55827e12 100644 --- a/capplets/keyboard/mate-keyboard-properties-xkb.h +++ b/capplets/keyboard/mate-keyboard-properties-xkb.h @@ -24,7 +24,7 @@ #ifndef __MATE_KEYBOARD_PROPERTY_XKB_H #define __MATE_KEYBOARD_PROPERTY_XKB_H -#include <mateconf/mateconf-client.h> +#include <gio/gio.h> #include "libmatekbd/matekbd-keyboard-config.h" @@ -34,22 +34,21 @@ extern "C" { #define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s)) extern XklEngine *engine; extern XklConfigRegistry *config_registry; -extern MateConfClient *xkb_mateconf_client; +extern GSettings *xkb_kbd_settings; +extern GSettings *xkb_general_settings; extern MatekbdKeyboardConfig initial_config; -extern void setup_xkb_tabs (GtkBuilder * dialog, - MateConfChangeSet * changeset); +extern void setup_xkb_tabs (GtkBuilder * dialog); extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog); extern void xkb_layouts_register_buttons_handlers (GtkBuilder * dialog); -extern void xkb_layouts_register_mateconf_listener (GtkBuilder * dialog); +extern void xkb_layouts_register_gsettings_listener (GtkBuilder * dialog); -extern void xkb_options_register_mateconf_listener (GtkBuilder * dialog); +extern void xkb_options_register_gsettings_listener (GtkBuilder * dialog); -extern void xkb_layouts_prepare_selected_tree (GtkBuilder * dialog, - MateConfChangeSet * changeset); +extern void xkb_layouts_prepare_selected_tree (GtkBuilder * dialog); extern void xkb_options_load_options (GtkBuilder * dialog); @@ -73,15 +72,9 @@ extern GSList *xkb_layouts_get_selected_list (void); extern GSList *xkb_options_get_selected_list (void); -#define xkb_layouts_set_selected_list(list) \ - mateconf_client_set_list (mateconf_client_get_default (), \ - MATEKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, \ - MATECONF_VALUE_STRING, (list), NULL) +extern void xkb_layouts_set_selected_list(GSList *list); -#define xkb_options_set_selected_list(list) \ - mateconf_client_set_list (mateconf_client_get_default (), \ - MATEKBD_KEYBOARD_CONFIG_KEY_OPTIONS, \ - MATECONF_VALUE_STRING, (list), NULL) +extern void xkb_options_set_selected_list(GSList *list); extern GtkWidget *xkb_layout_preview_create_widget (GtkBuilder * chooser_dialog); |