[totem] screenshot: Remove requirement on X11 for Save key



commit 430037da6527c1730fea9d16c9cf0e6e79a8a420
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Mar 29 03:53:37 2012 +0200

    screenshot: Remove requirement on X11 for Save key
    
    Helps with:
    https://bugzilla.gnome.org/show_bug.cgi?id=672735

 configure.in                                     |   21 ---------------------
 src/plugins/screenshot/totem-screenshot-plugin.c |    8 +-------
 2 files changed, 1 insertions(+), 28 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1cde398..c9437ca 100644
--- a/configure.in
+++ b/configure.in
@@ -274,22 +274,6 @@ for gdk_target in $gdk_targets; do
 		X_LIBS="$X_LIBRARIES -lX11"
 		AC_SUBST(X_LIBS)
 
-		dnl Multimedia keys
-		have_xfree=no
-		AC_COMPILE_IFELSE([
-			#include <X11/XF86keysym.h>
-			int main(int argc,char **argv) {
-			return 0;
-			}
-			],
-			have_xfree=yes
-		)
-		AC_MSG_CHECKING(for X11 XFree86 headers)
-		AC_MSG_RESULT([$have_xfree])
-		if test x"$have_xfree" = "xyes" ; then
-			AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
-		fi
-
 		break
 	fi
 done
@@ -864,11 +848,6 @@ if test x$ENABLE_NAUTILUS = xyes ; then
 else
 	AC_MSG_NOTICE([   Nautilus properties page disabled])
 fi
-if test x$have_xfree = xyes ; then
-	AC_MSG_NOTICE([** XFree86 multimedia keys support enabled])
-else
-	AC_MSG_NOTICE([   XFree86 multimedia keys support disabled])
-fi
 if test "$with_smclient" != "no" ; then
 	AC_MSG_NOTICE([** SM client support enabled])
 else
diff --git a/src/plugins/screenshot/totem-screenshot-plugin.c b/src/plugins/screenshot/totem-screenshot-plugin.c
index eebabf4..9ec7baa 100644
--- a/src/plugins/screenshot/totem-screenshot-plugin.c
+++ b/src/plugins/screenshot/totem-screenshot-plugin.c
@@ -33,10 +33,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <libpeas/peas-activatable.h>
 
-#ifdef HAVE_XFREE
-#include <X11/XF86keysym.h>
-#endif
-
 #include "totem-plugin.h"
 #include "totem-screenshot-plugin.h"
 #include "totem-screenshot.h"
@@ -132,11 +128,9 @@ static gboolean
 window_key_press_event_cb (GtkWidget *window, GdkEventKey *event, TotemScreenshotPlugin *self)
 {
 	switch (event->keyval) {
-#ifdef HAVE_XFREE
-	case XF86XK_Save:
+	case GDK_KEY_Save:
 		take_screenshot_action_cb (NULL, self);
 		break;
-#endif /* HAVE_XFREE */
 	case GDK_KEY_s:
 	case GDK_KEY_S:
 		if (event->state & GDK_CONTROL_MASK)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]