[Goodies-commits] r4024 - in xfvnc/trunk: . xfvnc

[Brian Tarricone]

Author: kelnos
Date: 2008-03-07 05:48:33 +0000 (Fri, 07 Mar 2008)
New Revision: 4024

Modified:
   xfvnc/trunk/configure.ac.in
   xfvnc/trunk/xfvnc/main.c
Log:
newer version of gtk-vnc don't have vnc_display_set_use_shm


Modified: xfvnc/trunk/configure.ac.in
===================================================================
--- xfvnc/trunk/configure.ac.in	2008-03-05 19:25:15 UTC (rev 4023)
+++ xfvnc/trunk/configure.ac.in	2008-03-07 05:48:33 UTC (rev 4024)
@@ -57,6 +57,14 @@
 XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GTK_VNC], [gtk-vnc-1.0], [0.2.0])
 
+dnl newer versions don't have vnc_display_set_use_shm
+saved_CFLAGS="$CFLAGS"
+saved_LIBS="$LIBS"
+CFLAGS="$CFLAGS $GTK_VNC_CFLAGS"
+LIBS="$LIBS $GTK_VNC_LIBS"
+AC_CHECK_FUNCS([vnc_display_set_use_shm])
+CFLAGS="$saved_CFLAGS"
+LIBS="$saved_LIBS"
 
 dnl check for debugging support
 XDT_FEATURE_DEBUG

Modified: xfvnc/trunk/xfvnc/main.c
===================================================================
--- xfvnc/trunk/xfvnc/main.c	2008-03-05 19:25:15 UTC (rev 4023)
+++ xfvnc/trunk/xfvnc/main.c	2008-03-07 05:48:33 UTC (rev 4024)
@@ -271,7 +271,9 @@
     gtk_widget_show(sw);
     
     xfvnc->vnc = vnc = vnc_display_new();
+#ifdef HAVE_VNC_DISPLAY_SET_USE_SHM
     vnc_display_set_use_shm(VNC_DISPLAY(vnc), TRUE);
+#endif
     vnc_display_set_pointer_local(VNC_DISPLAY(vnc), TRUE);
     vnc_display_set_pointer_grab(VNC_DISPLAY(vnc), FALSE);
     vnc_display_set_keyboard_grab(VNC_DISPLAY(vnc), FALSE);