[Xfce4-commits] <xfce4-clipman-plugin:master> build-env: Make xtst a hard-dependency

[Mike Massonnet]

Updating branch refs/heads/master
         to ba6814e9491adc1db46c628c4f587c62d3aace58 (commit)
       from a52d5c8aff4e92e1ea29a8e86f77ba425bfc00d8 (commit)

commit ba6814e9491adc1db46c628c4f587c62d3aace58
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Fri Oct 28 14:47:02 2011 +0200

    build-env: Make xtst a hard-dependency

 README              |    2 +-
 configure.ac.in     |   12 +-----------
 panel-plugin/menu.c |   17 ++++-------------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/README b/README
index 4542911..4d45d51 100644
--- a/README
+++ b/README
@@ -23,11 +23,11 @@ http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin/
 * libxfce4ui-1 4.8
 * libxfce4panel-1.0 4.8
 * libxfconf-0 4.8
+* xtst 1.0
 
  Optional
 
 * unique-1.0 1.0
-* xtst 1.0
 
  Install
 ---------
diff --git a/configure.ac.in b/configure.ac.in
index 06498a4..82dade7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -63,16 +63,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
-
-dnl ****************************************
-dnl *** Check for xtst (XTEST extension) ***
-dnl ****************************************
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXTST], [xtst], [1.0.0])
-if test x"$LIBXTST_FOUND" = x"yes"; then
-	enable_libxtst=yes
-else
-	enable_libxtst=no
-fi
+XDT_CHECK_PACKAGE([LIBXTST], [xtst], [1.0.0])
 
 dnl ***************************
 dnl *** Check for libunique ***
@@ -150,7 +141,6 @@ echo
 echo "Build Configuration:"
 echo
 echo "    * Debug Support:    $enable_debug"
-echo "    * XTEST extension:  $enable_libxtst"
 echo "    * Unique:           $enable_unique"
 echo
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
diff --git a/panel-plugin/menu.c b/panel-plugin/menu.c
index 1d11593..15a8a44 100644
--- a/panel-plugin/menu.c
+++ b/panel-plugin/menu.c
@@ -23,12 +23,9 @@
 #include <gtk/gtk.h>
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
-
-#ifdef HAVE_LIBXTST
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
-#endif
 
 #include "common.h"
 #include "collector.h"
@@ -51,18 +48,14 @@ struct _ClipmanMenuPrivate
   ClipmanHistory       *history;
   GSList               *list;
   gboolean              reverse_order;
-#ifdef HAVE_LIBXTST
   guint                 paste_on_activate;
-#endif
 };
 
 enum
 {
   REVERSE_ORDER = 1,
   INHIBIT_MENU_ITEM,
-#ifdef HAVE_LIBXTST
   PASTE_ON_ACTIVATE,
-#endif
 };
 
 static void             clipman_menu_finalize           (GObject *object);
@@ -132,7 +125,6 @@ cb_set_clipboard (GtkMenuItem *mi, const ClipmanHistoryItem *item)
       g_assert_not_reached ();
     }
 
-#ifdef HAVE_LIBXTST
   {
     int dummyi;
     KeySym key_sym;
@@ -187,7 +179,6 @@ cb_set_clipboard (GtkMenuItem *mi, const ClipmanHistoryItem *item)
 
     XCloseDisplay (display);
   }
-#endif
 }
 
 static void
@@ -406,11 +397,11 @@ clipman_menu_set_property (GObject *object,
       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->mi_inhibit),
                                       g_value_get_boolean (value));
       break;
-#ifdef HAVE_LIBXTST
+
     case PASTE_ON_ACTIVATE:
       priv->paste_on_activate = g_value_get_uint (value);
       break;
-#endif
+
     default:
       break;
     }
@@ -433,11 +424,11 @@ clipman_menu_get_property (GObject *object,
     case INHIBIT_MENU_ITEM:
       g_value_set_boolean (value, gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (priv->mi_inhibit)));
       break;
-#ifdef HAVE_LIBXTST
+
     case PASTE_ON_ACTIVATE:
       g_value_set_uint (value, priv->paste_on_activate);
       break;
-#endif
+
     default:
       break;
     }