rpms/xfce4-settings/devel xfce4-settings-4.6.3-xi2.patch, NONE, 1.1 xfce4-settings.spec, 1.20, 1.21

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5045/devel

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.3-xi2.patch 
Log Message:
* Tue Nov 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-2
- Patch xfce4-mouse-settings for newer libXi (#525501)


xfce4-settings-4.6.3-xi2.patch:
 dialogs/mouse-settings/main.c    |   24 +++++++++++++++++++++---
 xfce4-settings-helper/pointers.c |   19 +++++++++++++------
 2 files changed, 34 insertions(+), 9 deletions(-)

--- NEW FILE xfce4-settings-4.6.3-xi2.patch ---
Index: dialogs/mouse-settings/main.c
===================================================================
--- dialogs/mouse-settings/main.c	(revision 29485)
+++ dialogs/mouse-settings/main.c	(working copy)
@@ -1175,6 +1175,7 @@
     GtkAdjustment     *adjustment;
     GtkWidget         *widget;
     XExtensionVersion *version = NULL;
+    Display           *xdisplay;
 
     /* setup translation domain */
     xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
@@ -1221,16 +1222,33 @@
 
         return EXIT_FAILURE;
     }
-    
+
+    /* get the default display */
+    xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+
     /* check for Xi 1.4 */
-    version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+#ifdef XInput_2
+    version = XQueryInputVersion (xdisplay, 1, 4);
+    if (version == NULL || !version->present)
+#else
+    version = XGetExtensionVersion (xdisplay, INAME);
+    if (version == NULL || !version->present 
+        || (version->major_version == 1 && version->minor_version < 4))
+#endif
     {
+        /* cleanup */
+        if (version != NULL)
+            XFree (version);
+
         g_critical ("XI is not present or too old.");
         
         return EXIT_FAILURE;
     }
 
+    /* cleanup */
+    if (version != NULL)
+        XFree (version);
+
     /* open the xsettings and pointers channel */
     xsettings_channel = xfconf_channel_new ("xsettings");
     pointers_channel = xfconf_channel_new ("pointers");
Index: xfce4-settings-helper/pointers.c
===================================================================
--- xfce4-settings-helper/pointers.c	(revision 29485)
+++ xfce4-settings-helper/pointers.c	(working copy)
@@ -133,12 +133,16 @@
 
     /* get the default display */
     xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
-    
-    /* query the extension version */
+
+    /* check for Xi 1.4 */
+#ifdef XInput_2
+    version = XQueryInputVersion (xdisplay, 1, 4);
+    if (version == NULL || !version->present)
+#else
     version = XGetExtensionVersion (xdisplay, INAME);
-    
-    /* check for Xi 1.4 */
-    if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+    if (version == NULL || !version->present 
+        || (version->major_version == 1 && version->minor_version < 4))
+#endif
     {
         /* print error */
         g_critical ("XI is not present or too old.");
@@ -162,7 +166,6 @@
         gdk_flush ();
         gdk_error_trap_push ();
 
-        
         if (G_LIKELY (xdisplay))
         {
             /* monitor device changes */
@@ -178,6 +181,10 @@
         gdk_error_trap_pop ();
 #endif
     }
+
+    /* cleanup */
+    if (version != NULL)
+        XFree (version);
 }
 
 


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xfce4-settings.spec	29 Sep 2009 23:03:14 -0000	1.20
+++ xfce4-settings.spec	10 Nov 2009 00:10:45 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           xfce4-settings
 Version:        4.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+# http://bugzilla.xfce.org/show_bug.cgi?id=4929
+Patch0:         xfce4-settings-4.6.3-xi2.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +41,7 @@ This package includes the settings manag
 
 %prep
 %setup -q
+%patch0 -p0 -b .xi
 %patch10 -p1 -b .vendor
 
 %build
@@ -117,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Tue Nov 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-2
+- Patch xfce4-mouse-settings for newer libXi (#525501)
+
 * Tue Sep 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
 - Update to 4.6.3
 - Drop patches that were upstreamed