[Xfce4-commits] r27276 - in xfce4-settings/trunk: . dialogs/keyboard-settings

[Nick Schermer]

Author: nick
Date: 2008-07-13 15:24:38 +0000 (Sun, 13 Jul 2008)
New Revision: 27276

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/main.c
Log:
	* dialogs/keyboard-settings/main.c: Fix code. Thought I saved it,
	  but I didn't...

Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog	2008-07-13 15:17:34 UTC (rev 27275)
+++ xfce4-settings/trunk/ChangeLog	2008-07-13 15:24:38 UTC (rev 27276)
@@ -1,5 +1,10 @@
 2008-07-13	Nick Schermer <nick at xfce.org>
 
+	* dialogs/keyboard-settings/main.c: Fix code. Thought I saved it,
+	  but I didn't...
+
+2008-07-13	Nick Schermer <nick at xfce.org>
+
 	* dialogs/mouse-settings/mouse-dialog.glade,
 	  dialogs/mouse-settings/main.c,
 	  dialogs/mouse-settings/Makefile.am,

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c	2008-07-13 15:17:34 UTC (rev 27275)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c	2008-07-13 15:24:38 UTC (rev 27276)
@@ -47,7 +47,12 @@
 };
 
 
+static XfconfChannel *xsettings_channel;
+static XfconfChannel *xkb_channel;
+static XfconfChannel *kbd_channel;
 
+
+
 gboolean opt_version = FALSE;
 
 
@@ -406,9 +411,6 @@
 {
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
-  XfconfChannel   *xsettings_channel;
-  XfconfChannel   *xkb_channel;
-  XfconfChannel   *kbd_channel;
   GtkAdjustment   *net_cursor_blink_time_scale;
   GtkAdjustment   *xkb_key_repeat_delay_scale;
   GtkAdjustment   *xkb_key_repeat_rate_scale;
@@ -420,10 +422,6 @@
   GtkWidget       *delete_shortcut_button;
   GtkWidget       *dialog;
 
-  xsettings_channel = xfconf_channel_new ("xsettings");
-  xkb_channel = xfconf_channel_new ("xkb");
-  kbd_channel = xfconf_channel_new ("xfce4-keyboard-shortcuts");
-
   net_cursor_blink_check = glade_xml_get_widget (gxml, "net_cursor_blink_check");
   net_cursor_blink_time_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "net_cursor_blink_time_scale")));
   xkb_key_repeat_check = glade_xml_get_widget (gxml, "xkb_key_repeat_check");
@@ -512,6 +510,11 @@
     }
 
   xfconf_init(NULL);
+  
+  /* load channels */
+  xsettings_channel = xfconf_channel_new ("xsettings");
+  xkb_channel = xfconf_channel_new ("xkb");
+  kbd_channel = xfconf_channel_new ("xfce4-keyboard-shortcuts");
 
   /* Parse Glade XML */
   gxml = glade_xml_new_from_buffer (keyboard_dialog_glade, keyboard_dialog_glade_length, NULL, NULL);