gnome-settings-daemon r600 - in branches/gnome-2-24: . plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Sat Nov  8 09:15:33 2008
New Revision: 600
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=600&view=rev

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

	Merged from trunk.

	Patch by: William Grant <wgrant ubuntu com>

	* plugins/mouse/gsd-mouse-manager.c: (devicepresence_filter): listen
	for DeviceEnabled instead of DeviceAdded so we can be sure it has been
	initialized (bug #559827)


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c

Modified: branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c	(original)
+++ branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c	Sat Nov  8 09:15:33 2008
@@ -318,7 +318,7 @@
         if (xev->type == xi_presence)
         {
             XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;
-            if (dpn->devchange == DeviceAdded)
+            if (dpn->devchange == DeviceEnabled)
                 set_mouse_settings ((GsdMouseManager *) data);
         }
         return GDK_FILTER_CONTINUE;