r19642 - in /desktop/experimental/totem/debian: changelog patches/01_fake_keypresses.patch

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Apr 19 14:39:49 UTC 2009


Author: sjoerd
Date: Sun Apr 19 14:39:48 2009
New Revision: 19642

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19642
Log:
debian/patches/01_fake_keypresses.patch: Updated and simplified

Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/patches/01_fake_keypresses.patch

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=19642&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Sun Apr 19 14:39:48 2009
@@ -7,6 +7,7 @@
   * New upstream release (2.26.1)
   * debian/patches/02_flv.patch: Dropped, fixed upstream
   * debian/patches/04_tracker_build.patch: Dropped, fixed upstream
+  * debian/patches/01_fake_keypresses.patch: Updated and simplified
 
   [ Emilio Pozuelo Monfort ]
   * Recommend gnome-codec-install rather than gnome-app-install.

Modified: desktop/experimental/totem/debian/patches/01_fake_keypresses.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/01_fake_keypresses.patch?rev=19642&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/01_fake_keypresses.patch (original)
+++ desktop/experimental/totem/debian/patches/01_fake_keypresses.patch Sun Apr 19 14:39:48 2009
@@ -1,150 +1,13 @@
-Index: totem-2.24.3/configure.in
-===================================================================
---- totem-2.24.3.orig/configure.in	2009-01-23 17:05:55.248659458 +0100
-+++ totem-2.24.3/configure.in	2009-01-23 17:06:01.120650870 +0100
-@@ -276,16 +276,6 @@ if test x$(pkg-config --variable=target 
- 	CFLAGS="$X_INCLUDES $CFLAGS"
- 	LIBS="$X_LIBRARIES $LIBS"
- 
--	XTEST_LIBS=""
--	enable_xtest=no
--	AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
--		XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES"
--		enable_xtest=yes
--		AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]),
--		,
--		$X_LIBRARIES)
--	AC_SUBST(XTEST_LIBS)
--
- 	PKG_CHECK_MODULES(XVIDMODE, xrandr >= 1.1.1 xxf86vm >= 1.0.1,
- 		have_xvidmode=yes, have_xvidmode=no)
- 
-Index: totem-2.24.3/lib/totem-scrsaver.c
-===================================================================
---- totem-2.24.3.orig/lib/totem-scrsaver.c	2009-01-23 17:01:55.209153598 +0100
-+++ totem-2.24.3/lib/totem-scrsaver.c	2009-01-23 17:05:47.993152403 +0100
-@@ -30,10 +30,6 @@
- #ifdef GDK_WINDOWING_X11
+diff --git a/lib/totem-scrsaver.c b/lib/totem-scrsaver.c
+index 089cbb0..526f14c 100644
+--- a/lib/totem-scrsaver.c
++++ b/lib/totem-scrsaver.c
+@@ -31,6 +31,8 @@
  #include <gdk/gdkx.h>
  #include <X11/keysym.h>
--
--#ifdef HAVE_XTEST
--#include <X11/extensions/XTest.h>
--#endif /* HAVE_XTEST */
- #endif /* GDK_WINDOWING_X11 */
  
- #ifdef WITH_DBUS
-@@ -70,11 +66,6 @@ struct TotemScrsaverPrivate {
- 	int interval;
- 	int prefer_blanking;
- 	int allow_exposures;
--
--	/* For use with XTest */
--	int keycode1, keycode2;
--	int *keycode;
--	gboolean have_xtest;
- };
- 
- G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
-@@ -241,15 +232,6 @@ screensaver_finalize_dbus (TotemScrsaver
- static void
- screensaver_enable_x11 (TotemScrsaver *scr)
- {
--
--#ifdef HAVE_XTEST
--	if (scr->priv->have_xtest != FALSE)
--	{
--		g_source_remove_by_user_data (scr);
--		return;
--	}
--#endif /* HAVE_XTEST */
--
- 	XLockDisplay (GDK_DISPLAY());
- 	XSetScreenSaver (GDK_DISPLAY(),
- 			scr->priv->timeout,
-@@ -259,56 +241,9 @@ screensaver_enable_x11 (TotemScrsaver *s
- 	XUnlockDisplay (GDK_DISPLAY());
- }
- 
--#ifdef HAVE_XTEST
--static gboolean
--fake_event (TotemScrsaver *scr)
--{
--	if (scr->priv->disabled)
--	{
--		XLockDisplay (GDK_DISPLAY());
--		XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
--				True, CurrentTime);
--		XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
--				False, CurrentTime);
--		XUnlockDisplay (GDK_DISPLAY());
--		/* Swap the keycode */
--		if (scr->priv->keycode == &scr->priv->keycode1)
--			scr->priv->keycode = &scr->priv->keycode2;
--		else
--			scr->priv->keycode = &scr->priv->keycode1;
--	}
--
--	return TRUE;
--}
--#endif /* HAVE_XTEST */
--
- static void
- screensaver_disable_x11 (TotemScrsaver *scr)
- {
--
--#ifdef HAVE_XTEST
--	if (scr->priv->have_xtest != FALSE)
--	{
--		XLockDisplay (GDK_DISPLAY());
--		XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
--				&scr->priv->interval,
--				&scr->priv->prefer_blanking,
--				&scr->priv->allow_exposures);
--		XUnlockDisplay (GDK_DISPLAY());
--
--		if (scr->priv->timeout != 0)
--		{
--			g_timeout_add (scr->priv->timeout / 2 * 1000,
--					(GSourceFunc) fake_event, scr);
--		} else {
--			g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
--					(GSourceFunc) fake_event, scr);
--		}
--
--		return;
--	}
--#endif /* HAVE_XTEST */
--
- 	XLockDisplay (GDK_DISPLAY());
- 	XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
- 			&scr->priv->interval,
-@@ -322,28 +257,6 @@ screensaver_disable_x11 (TotemScrsaver *
- static void
- screensaver_init_x11 (TotemScrsaver *scr)
- {
--#ifdef HAVE_XTEST
--	int a, b, c, d;
--
--	XLockDisplay (GDK_DISPLAY());
--	scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d) == True);
--	if (scr->priv->have_xtest != FALSE)
--	{
--		scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
--		if (scr->priv->keycode1 == 0) {
--			g_warning ("scr->priv->keycode1 not existant");
--		}
--		scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_R);
--		if (scr->priv->keycode2 == 0) {
--			scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
--			if (scr->priv->keycode2 == 0) {
--				g_warning ("scr->priv->keycode2 not existant");
--			}
--		}
--		scr->priv->keycode = &scr->priv->keycode1;
--	}
--	XUnlockDisplay (GDK_DISPLAY());
--#endif /* HAVE_XTEST */
- }
- 
- static void
++#undef HAVE_XTEST
++
+ #ifdef HAVE_XTEST
+ #include <X11/extensions/XTest.h>
+ #endif /* HAVE_XTEST */




More information about the pkg-gnome-commits mailing list