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

[jensg svn gnome org]

Author: jensg
Date: Sat Nov 29 14:12:44 2008
New Revision: 618
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=618&view=rev

Log:
2008-11-29  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-xkb.c: (gsd_keyboard_xkb_init): fix
	check for xklavier device discovery


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

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.c	Sat Nov 29 14:12:44 2008
@@ -394,7 +394,7 @@
 		gdk_window_add_filter (NULL, (GdkFilterFunc)
 				       gsd_keyboard_xkb_evt_filter, NULL);
 
-		if (xkl_engine_get_features (xkl_engine) |
+		if (xkl_engine_get_features (xkl_engine) &
 		    XKLF_DEVICE_DISCOVERY)
 			g_signal_connect (xkl_engine, "X-new-device",
 					  G_CALLBACK