diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2010-10-03 08:42:48 +0100 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2010-10-03 08:42:48 +0100 |
| commit | a177d5a7e194cfc106a906ca0d81b16a99fe02ee (patch) | |
| tree | 346094feef799818199a2519665097456247b918 /libgnomekbd/gkbd-desktop-config.h | |
| parent | f05774eace6d681b0fc59b2abee650b847fff8a1 (diff) | |
| download | libgnomekbd-a177d5a7e194cfc106a906ca0d81b16a99fe02ee.tar.gz | |
Moving from gconf to gsettings. API/ABI changes
Diffstat (limited to 'libgnomekbd/gkbd-desktop-config.h')
| -rw-r--r-- | libgnomekbd/gkbd-desktop-config.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libgnomekbd/gkbd-desktop-config.h b/libgnomekbd/gkbd-desktop-config.h index 5f66909..acd160c 100644 --- a/libgnomekbd/gkbd-desktop-config.h +++ b/libgnomekbd/gkbd-desktop-config.h @@ -22,10 +22,11 @@ #include <X11/Xlib.h> #include <glib.h> -#include <gconf/gconf-client.h> +#include <gio/gio.h> #include <libxklavier/xklavier.h> -extern const gchar GKBD_DESKTOP_CONFIG_DIR[]; +#define GKBD_DESKTOP_SCHEMA "org.gnome.libgnomekbd.desktop" + extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[]; extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[]; extern const gchar GKBD_DESKTOP_CONFIG_KEY_HANDLE_INDICATORS[]; @@ -42,7 +43,7 @@ typedef struct _GkbdDesktopConfig { gboolean load_extra_items; /* private, transient */ - GConfClient *conf_client; + GSettings *settings; int config_listener_id; XklEngine *engine; } GkbdDesktopConfig; @@ -51,14 +52,12 @@ typedef struct _GkbdDesktopConfig { * GkbdDesktopConfig functions */ extern void gkbd_desktop_config_init (GkbdDesktopConfig * config, - GConfClient * conf_client, XklEngine * engine); extern void gkbd_desktop_config_term (GkbdDesktopConfig * config); -extern void gkbd_desktop_config_load_from_gconf (GkbdDesktopConfig * - config); +extern void gkbd_desktop_config_load (GkbdDesktopConfig * config); -extern void gkbd_desktop_config_save_to_gconf (GkbdDesktopConfig * config); +extern void gkbd_desktop_config_save (GkbdDesktopConfig * config); extern gboolean gkbd_desktop_config_activate (GkbdDesktopConfig * config); @@ -84,7 +83,7 @@ extern void gkbd_desktop_config_lock_prev_group (GkbdDesktopConfig * extern void gkbd_desktop_config_restore_group (GkbdDesktopConfig * config); extern void gkbd_desktop_config_start_listen (GkbdDesktopConfig * config, - GConfClientNotifyFunc func, + GCallback func, gpointer user_data); extern void gkbd_desktop_config_stop_listen (GkbdDesktopConfig * config); |