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

Initial xkb configuration is cached. Should make things a bit faster

Browse source
This commit is contained in:
Sergey V. Udaltsov 2004-01-12 13:08:34 +00:00
parent a103fa9147
commit 8e4dbf2179
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
capplets/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -40,6 +40,8 @@
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
static GSwitchItXkbConfig initialConfig;
char * char *
xci_desc_to_utf8 (XklConfigItem * ci) xci_desc_to_utf8 (XklConfigItem * ci)
{ {
@ -116,6 +118,7 @@ model_to_widget (GConfPropertyEditor * peditor, GConfValue * value)
static void static void
cleanup_xkb_tabs (GladeXML * dialog) cleanup_xkb_tabs (GladeXML * dialog)
{ {
GSwitchItXkbConfigTerm (&initialConfig);
XklConfigFreeRegistry (); XklConfigFreeRegistry ();
XklConfigTerm (); XklConfigTerm ();
XklTerm (); XklTerm ();
@ -188,6 +191,8 @@ update_model (GConfClient * client,
void void
setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset) setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
{ {
GConfClient *confClient = gconf_client_get_default ();
XklInit (GDK_DISPLAY ()); XklInit (GDK_DISPLAY ());
XklConfigInit (); XklConfigInit ();
XklConfigLoadRegistry (); XklConfigLoadRegistry ();
@ -223,6 +228,10 @@ setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
(GConfClientNotifyFunc) (GConfClientNotifyFunc)
update_model, dialog, NULL, NULL); update_model, dialog, NULL, NULL);
GSwitchItXkbConfigInit (&initialConfig, confClient);
g_object_unref (confClient);
GSwitchItXkbConfigLoadInitial (&initialConfig);
enable_disable_restoring (dialog); enable_disable_restoring (dialog);
} }
@ -237,7 +246,7 @@ enable_disable_restoring (GladeXML * dialog)
g_object_unref (confClient); g_object_unref (confClient);
GSwitchItXkbConfigLoad (&gswic); GSwitchItXkbConfigLoad (&gswic);
enable = !GSwitchItXkbConfigEqualsToInitial (&gswic); enable = !GSwitchItXkbConfigEquals (&gswic, &initialConfig);
GSwitchItXkbConfigTerm (&gswic); GSwitchItXkbConfigTerm (&gswic);
gtk_widget_set_sensitive (WID ("xkb_reset_to_defaults"), enable); gtk_widget_set_sensitive (WID ("xkb_reset_to_defaults"), enable);