gnome-settings-daemon r266 - in trunk: . plugins/keyboard

[jensg svn gnome org]

Author: jensg
Date: Sun Apr  6 15:33:12 2008
New Revision: 266
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=266&view=rev

Log:
2008-04-06  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-xkb.c:
	* plugins/keyboard/gsd-keyboard-xkb.h: initialize inited_ok or
	behaviour is undefined when xkb setup fails; don't export XklEngine


Modified:
   trunk/ChangeLog
   trunk/plugins/keyboard/gsd-keyboard-xkb.c
   trunk/plugins/keyboard/gsd-keyboard-xkb.h

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.c	Sun Apr  6 15:33:12 2008
@@ -38,7 +38,7 @@
 #include "gsd-keyboard-xkb.h"
 #include "delayed-dialog.h"
 
-XklEngine *xkl_engine;
+static XklEngine *xkl_engine;
 
 static GkbdDesktopConfig current_config;
 static GkbdKeyboardConfig current_kbd_config;
@@ -46,7 +46,7 @@
 /* never terminated */
 static GkbdKeyboardConfig initial_sys_kbd_config;
 
-static gboolean inited_ok;
+static gboolean inited_ok = FALSE;
 
 static PostActivationCallback pa_callback = NULL;
 static void *pa_callback_user_data = NULL;

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.h
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.h	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.h	Sun Apr  6 15:33:12 2008
@@ -40,6 +40,4 @@
 
 GType keyboard_config_registry_get_type (void);
 
-extern XklEngine *xkl_engine;
-
 #endif