Author: nick Date: 2009-03-11 17:43:11 +0000 (Wed, 11 Mar 2009) New Revision: 29649
Modified: xfce4-settings/trunk/NEWS xfce4-settings/trunk/dialogs/mouse-settings/main.c xfce4-settings/trunk/xfce4-settings-helper/pointers.c Log: Make sure inputproto 1.4.2 is available before enabling device hotplugging in the code (bug #5084). Modified: xfce4-settings/trunk/NEWS =================================================================== --- xfce4-settings/trunk/NEWS 2009-03-08 17:07:16 UTC (rev 29648) +++ xfce4-settings/trunk/NEWS 2009-03-11 17:43:11 UTC (rev 29649) @@ -2,6 +2,8 @@ ===== - Use the folder name for selecting the icon- and style-theme in the appearance dialog (bug #4997). +- Make sure inputproto 1.4.2 is available before enabling device + hotplugging in the code (bug #5084). 4.6.0 ===== Modified: xfce4-settings/trunk/dialogs/mouse-settings/main.c =================================================================== --- xfce4-settings/trunk/dialogs/mouse-settings/main.c 2009-03-08 17:07:16 UTC (rev 29648) +++ xfce4-settings/trunk/dialogs/mouse-settings/main.c 2009-03-11 17:43:11 UTC (rev 29649) @@ -50,8 +50,8 @@ #include "mouse-dialog_glade.h" -/* this is only added to make the code compile */ -#if XI_Add_DevicePresenceNotify_Major >= 1 +/* test if the required version of inputproto (1.4.2) is available */ +#if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved) #define HAS_DEVICE_HOTPLUGGING #else #undef HAS_DEVICE_HOTPLUGGING Modified: xfce4-settings/trunk/xfce4-settings-helper/pointers.c =================================================================== --- xfce4-settings/trunk/xfce4-settings-helper/pointers.c 2009-03-08 17:07:16 UTC (rev 29648) +++ xfce4-settings/trunk/xfce4-settings-helper/pointers.c 2009-03-11 17:43:11 UTC (rev 29649) @@ -42,8 +42,8 @@ #define MAX_DENOMINATOR (100.00) -/* this is only added to make the code compile */ -#ifdef XI_Add_DevicePresenceNotify_Major +/* test if the required version of inputproto (1.4.2) is available */ +#if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved) #define HAS_DEVICE_HOTPLUGGING #else #undef HAS_DEVICE_HOTPLUGGING _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits