[Pkg-xfce-devel] Bug#712868: Improved patch...

[Koehrer Mathias (ETAS/ESS2)]

Dear Maintainer,

an even improved patch is attached. Replace the hard coded address "1" by
the #define NoSuchExtension as provided in X11/extensions/Xi.h.

Regards

Mathias


---
Author: Mathias Koehrer <mathias.koehrer at etas.com>

--- xfce4-settings-4.8.3.orig/xfce4-settings-helper/pointers.c
+++ xfce4-settings-4.8.3/xfce4-settings-helper/pointers.c
@@ -135,8 +135,11 @@ xfce_pointers_helper_init (XfcePointersH
     /* query the extension version */
     version = XGetExtensionVersion (xdisplay, INAME);

-    /* check for Xi */
-    if (version == NULL || !version->present)
+    /* check for Xi.
+     * Note: if running under VNC, XGetExtensionVersion returns a pointer
+     * with the address "1" (=NoSuchExtension). This has to be considered here.
+     * */
+    if (version == NULL || version == (void*)NoSuchExtension || !version->present)
     {
         g_critical ("XI is not present.");
     }