applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More changes from gconf-client to GSettings

Browse source 
Getting rid of obsolete and broken gconf-property-editor in favor of gsettings.
This commit is contained in:
Sergey V. Udaltsov 2010-10-09 22:25:00 +01:00
parent 0f92fdad56
commit aa6f5455f7
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
panels/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -29,8 +29,6 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "gconf-property-editor.h"
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
#include <libgnomekbd/gkbd-desktop-config.h> #include <libgnomekbd/gkbd-desktop-config.h>
@ -99,7 +97,7 @@ setup_model_entry (GtkBuilder * dialog)
GKBD_KEYBOARD_CONFIG_KEY_MODEL, dialog); GKBD_KEYBOARD_CONFIG_KEY_MODEL, dialog);
g_signal_connect (xkb_keyboard_settings, "changed", g_signal_connect (xkb_keyboard_settings, "changed",
(GCallback) model_key_changed, dialog); G_CALLBACK (model_key_changed), dialog);
} }
static void static void
@ -133,13 +131,16 @@ reset_to_defaults (GtkWidget * button, GtkBuilder * dialog)
} }
static void static void
chk_separate_group_per_window_toggled (GConfPropertyEditor * peditor, chk_separate_group_per_window_toggled (GSettings * settings,
const gchar * key, const gchar * key,
const GConfValue * value,
GtkBuilder * dialog) GtkBuilder * dialog)
{ {
gtk_widget_set_sensitive (WID ("chk_new_windows_inherit_layout"), if (!strcmp (key, GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW)) {
gconf_value_get_bool (value)); gboolean gpw = g_settings_get_boolean (settings, key);
gtk_widget_set_sensitive (WID
("chk_new_windows_inherit_layout"),
gpw);
}
} }
static void static void
@ -156,7 +157,6 @@ chk_new_windows_inherit_layout_toggled (GtkWidget *
void void
setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset) setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset)
{ {
GObject *peditor;
GtkWidget *chk_new_windows_inherit_layout = GtkWidget *chk_new_windows_inherit_layout =
WID ("chk_new_windows_inherit_layout"); WID ("chk_new_windows_inherit_layout");
@ -179,12 +179,13 @@ setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset)
setup_model_entry (dialog); setup_model_entry (dialog);
peditor = gconf_peditor_new_boolean g_settings_bind (xkb_desktop_settings,
(changeset, (gchar *) GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW, GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
WID ("chk_separate_group_per_window"), NULL); WID ("chk_separate_group_per_window"), "active",
G_SETTINGS_BIND_DEFAULT);
g_signal_connect (peditor, "value-changed", (GCallback) g_signal_connect (xkb_desktop_settings, "changed",
chk_separate_group_per_window_toggled, dialog); G_CALLBACK
(chk_separate_group_per_window_toggled), dialog);
#ifdef HAVE_X11_EXTENSIONS_XKB_H #ifdef HAVE_X11_EXTENSIONS_XKB_H
if (strcmp (xkl_engine_get_backend_name (engine), "XKB")) if (strcmp (xkl_engine_get_backend_name (engine), "XKB"))
@ -209,8 +210,10 @@ setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset)
dialog); dialog);
g_signal_connect (G_OBJECT (chk_new_windows_inherit_layout), g_signal_connect (G_OBJECT (chk_new_windows_inherit_layout),
"toggled", (GCallback) "toggled",
chk_new_windows_inherit_layout_toggled, dialog); G_CALLBACK
(chk_new_windows_inherit_layout_toggled),
dialog);
g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")), g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")),
"clicked", "clicked",