[Pkg-xfce-commits] r2058 - in desktop/trunk/xfce-mcs-plugins/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-18 16:53:43 +0000 (Sun, 18 May 2008)
New Revision: 2058

Added:
   desktop/trunk/xfce-mcs-plugins/debian/patches/02_fix-mouse-plugin-xinput.dpatch
Modified:
   desktop/trunk/xfce-mcs-plugins/debian/changelog
   desktop/trunk/xfce-mcs-plugins/debian/patches/00list
Log:
debian/patches: 02_fix-mouse-plugin-xinput added, fix endless loop when
using Xinput driver (Xfce #3974, r26870)

Modified: desktop/trunk/xfce-mcs-plugins/debian/changelog
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/changelog	2008-05-18 16:50:06 UTC (rev 2057)
+++ desktop/trunk/xfce-mcs-plugins/debian/changelog	2008-05-18 16:53:43 UTC (rev 2058)
@@ -8,8 +8,10 @@
     - fix spelling error.
   * debian/rules: config.{guess,sub} are correctly up to date.
   * debian/copyright: use © sign. 
+  * debian/patches: 02_fix-mouse-plugin-xinput added, fix endless loop when
+    using Xinput driver (Xfce #3974, r26870)
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 18:41:46 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 18:44:09 +0200
 
 xfce-mcs-plugins (4.4.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfce-mcs-plugins/debian/patches/00list
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/patches/00list	2008-05-18 16:50:06 UTC (rev 2057)
+++ desktop/trunk/xfce-mcs-plugins/debian/patches/00list	2008-05-18 16:53:43 UTC (rev 2058)
@@ -1 +1,2 @@
 01_mouse_plugin_memory_fix.dpatch
+02_fix-mouse-plugin-xinput.dpatch

Added: desktop/trunk/xfce-mcs-plugins/debian/patches/02_fix-mouse-plugin-xinput.dpatch
===================================================================
--- desktop/trunk/xfce-mcs-plugins/debian/patches/02_fix-mouse-plugin-xinput.dpatch	                        (rev 0)
+++ desktop/trunk/xfce-mcs-plugins/debian/patches/02_fix-mouse-plugin-xinput.dpatch	2008-05-18 16:53:43 UTC (rev 2058)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugzilla.xfce.org/show_bug.cgi?id=3974
+
+ at DPATCH@
+Index: xfce_4_4/plugins/mouse_plugin/mouse_plugin.c
+===================================================================
+--- xfce_4_4/plugins/mouse_plugin/mouse_plugin.c	(revision 26869)
++++ xfce_4_4/plugins/mouse_plugin/mouse_plugin.c	(revision 26870)
+@@ -172,7 +172,7 @@
+ {
+     XDeviceInfo *device_info;
+     unsigned char *buttons;
+-    gint n_buttons, n_devices, i;
++    gint n_buttons, n_devices, i, j;
+     gint idx_1 = 0, idx_3 = 1;
+     gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE;
+ 
+@@ -212,15 +212,15 @@
+             n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity);
+         }
+ 
+-        for (i = 0; i < n_buttons; i++)
++        for (j = 0; j < n_buttons; j++)
+         {
+-            if (buttons[i] == 1)
++            if (buttons[j] == 1)
+             {
+-                idx_1 = i;
++                idx_1 = j;
+             }
+-            else if (buttons[i] == ((n_buttons < 3) ? 2 : 3))
++            else if (buttons[j] == ((n_buttons < 3) ? 2 : 3))
+             {
+-                idx_3 = i;
++                idx_3 = j;
+             }
+         }
+