From 6b0d6cac30a70e50c2ed55fb0bc67ca577f591e9 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@src.gnome.org>
Date: Sat, 8 Jan 2005 21:23:15 +0000
Subject: [PATCH] a bit of more optimization

---
 gnome-settings-daemon/gnome-settings-keyboard-xkb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
index fde8a2d50..24d468737 100644
--- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
+++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
@@ -45,6 +45,8 @@
 
 static GSwitchItConfig currentConfig;
 static GSwitchItKbdConfig currentKbdConfig;
+
+/* never terminated */
 static GSwitchItKbdConfig initialSysKbdConfig;
 
 static gboolean initedOk;
@@ -143,9 +145,7 @@ apply_xkb_settings (void)
 
 	if (currentKbdConfig.overrideSettings) {
 		/* initialization - from the system settings */
-		GSwitchItKbdConfigLoadFromXInitial (&currentKbdConfig);
-		currentKbdConfig.overrideSettings = FALSE;
-		GSwitchItKbdConfigSaveToGConf (&currentKbdConfig);
+		GSwitchItKbdConfigSaveToGConf (&initialSysKbdConfig);
 	} else {
 		GSwitchItKbdConfigLoadFromXCurrent (&currentSysKbdConfig);
 		/* Activate - only if different! */
@@ -181,7 +181,6 @@ gnome_settings_keyboard_xkb_sysconfig_changed_response (GtkDialog * dialog,
 		break;
 	}
 	gtk_widget_destroy (GTK_WIDGET (dialog));
-	GSwitchItKbdConfigTerm (&initialSysKbdConfig);
 }
 
 static void
@@ -199,6 +198,7 @@ gnome_settings_keyboard_xkb_analyze_sysconfig (void)
 	g_object_unref (confClient);
 	GSwitchItKbdConfigLoadFromGConfBackup (&backupGConfKbdConfig);
 	GSwitchItKbdConfigLoadFromXInitial (&initialSysKbdConfig);
+	initialSysKbdConfig.overrideSettings = FALSE;
 
 	isConfigChanged = g_slist_length (backupGConfKbdConfig.layouts) &&
 	    !GSwitchItKbdConfigEquals (&initialSysKbdConfig, &backupGConfKbdConfig);