Merge lp:~oif-packaging/libgrip/real-020 into lp:libgrip/quantal

[Jussi Pakkanen]

Packaging update to 0.2.0. Haven't actually tried building it yet, though...

=== modified file 'AUTHORS'
--- AUTHORS	2011-03-23 18:20:10 +0000
+++ AUTHORS	2011-07-11 12:13:41 +0000
@@ -4,6 +4,7 @@
  Chase Douglas 
  Cody Russell 
  Duncan McGreggor 
+ Jussi Pakkanen 
  Ken VanDine 
  Kevin Wells 
  Stephen M. Webb 

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-23 18:20:10 +0000
+++ ChangeLog	2011-07-11 12:13:41 +0000
@@ -1,5 +1,224 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged device separation branch.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Drop libgrip element from pkg-config file.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Update Geis dependency info.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Fix exit crashing bug.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Do not subscribe if the list of devices is empty.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Code hygiene additions.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	If clause simplification.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged changes in trunk.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Work on separating different device types to their own subscriptions.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Reordered function arguments for consistency.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Extract binding to a function.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Extract registration to a function.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged build fixes.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Fixed documentation for register_window.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Fix registration calls.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Removed circular dependency.
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Merge remove-version branch to remove version from library name
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Remove the version number from the library name
+	
+	This will make it easier to maintain since we only plan to support one
+	version of libgrip at any time.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Hide all Autotools garbage from bzr st.
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Merge device class types subscription changes
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Remove GRIP_DEVICE_ALL from GripDeviceType enum
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Bump the version to 0.2.0
+	
+	This brings with it API and ABI breakage
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Move devices array allocation to object init time from construction time
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Rework GRIP_DEVICE_ALL so it is the union of all the device types
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Add argument to specify device type when registering for gestures
+	
+	Possible values:
+	
+	* GRIP_DEVICE_ALL
+	
+	or the logical OR'ing of:
+	
+	* GRIP_DEVICE_TOUCHSCREEN
+	* GRIP_DEVICE_TOUCHPAD
+	* GRIP_DEVICE_INDEPENDENT
+
[phone]  Chase Douglas  <[e-mail]>
+
+	Get device types at initialization time
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged unsubscribe branch.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Terminate Geis instance on unregistering.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Re-subscribe to gestures. Doesn't work yet for some reason.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Prepare version-script for the next release.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Free the registration object.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Unregistering works for some values of works.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Minor refactoring.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Refactored main program so that unregistering is possible.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Renamed element for clarity.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	GUI has a button to enable and disable gestures.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Move subscription to its own function.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged deduplication.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Put braces according to coding standards.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Removed useless duplication with a common function.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged GTK3 branch.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Fix dependencies in pkg-config file.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Use GTK3 drawing model.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Final accessor function change.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Use correct X backend call.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Convert GtkObject to GtkWidget.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Converted struct accesses to accessor functions.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged underscore 2 fix.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	More underscore removal.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Merged underscore removal.
+
[phone]  Jussi Pakkanen  <[e-mail]>
+
+	Removed double underscores.
+
 2011-03-23  Chase Douglas  <[e-mail]>
 
 	Release version 0.1.7

=== modified file 'Makefile.am'
--- Makefile.am	2011-03-23 18:20:10 +0000
+++ Makefile.am	2011-07-11 12:13:41 +0000
@@ -1,12 +1,9 @@
 SUBDIRS = src bindings examples/rectangle-mover
 
-libgrip-0.1.pc: libgrip.pc
-	cp -f libgrip.pc libgrip-0.1.pc
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgrip-0.1.pc
+pkgconfig_DATA = libgrip.pc
 
-CLEANFILES = libgrip-0.1.pc
+CLEANFILES = libgrip.pc
 DISTCLEANFILES = libgrip.pc grip*.tar.gz
 EXTRA_DIST = libgrip.pc.in m4/introspection.m4
 

=== modified file 'Makefile.in'
--- Makefile.in	2011-03-23 18:20:10 +0000
+++ Makefile.in	2011-07-11 12:13:41 +0000
@@ -285,8 +285,8 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = src bindings examples/rectangle-mover
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgrip-0.1.pc
-CLEANFILES = libgrip-0.1.pc
+pkgconfig_DATA = libgrip.pc
+CLEANFILES = libgrip.pc
 DISTCLEANFILES = libgrip.pc grip*.tar.gz
 EXTRA_DIST = libgrip.pc.in m4/introspection.m4
 ACLOCAL_AMFLAGS = -I m4
@@ -817,9 +817,6 @@
 	uninstall uninstall-am uninstall-pkgconfigDATA
 
 
-libgrip-0.1.pc: libgrip.pc
-	cp -f libgrip.pc libgrip-0.1.pc
-
 dist-hook:
 	@if test -d "$(top_srcdir)/.bzr";								\
 		then											\

=== modified file 'configure'
--- configure	2011-03-23 18:20:10 +0000
+++ configure	2011-07-11 12:13:41 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for grip 0.1.7.
+# Generated by GNU Autoconf 2.67 for grip 0.2.0.
 #
 # Report bugs to <https://bugs.launchpad.net/libgrip>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='grip'
 PACKAGE_TARNAME='grip'
-PACKAGE_VERSION='0.1.7'
-PACKAGE_STRING='grip 0.1.7'
+PACKAGE_VERSION='0.2.0'
+PACKAGE_STRING='grip 0.2.0'
 PACKAGE_BUGREPORT='https://bugs.launchpad.net/libgrip'
 PACKAGE_URL=''
 
@@ -1481,7 +1481,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures grip 0.1.7 to adapt to many kinds of systems.
+\`configure' configures grip 0.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1551,7 +1551,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grip 0.1.7:";;
+     short | recursive ) echo "Configuration of grip 0.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1671,7 +1671,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grip configure 0.1.7
+grip configure 0.2.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2040,7 +2040,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by grip $as_me 0.1.7, which was
+It was created by grip $as_me 0.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2875,7 +2875,7 @@
 
 # Define the identity of the package.
  PACKAGE='grip'
- VERSION='0.1.7'
+ VERSION='0.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3127,20 +3127,20 @@
 
 
 GRIP_MAJOR_VERSION=0
-GRIP_MINOR_VERSION=1
-GRIP_MICRO_VERSION=7
-GRIP_VERSION=0.1.7
-
-
-
-
-
-
-
-
-GRIP_LT_CURRENT=107
+GRIP_MINOR_VERSION=2
+GRIP_MICRO_VERSION=0
+GRIP_VERSION=0.2.0
+
+
+
+
+
+
+
+
+GRIP_LT_CURRENT=200
 GRIP_LT_REV=0
-GRIP_LT_AGE=107
+GRIP_LT_AGE=200
 GRIP_LT_VERSION="$GRIP_LT_CURRENT:$GRIP_LT_REV:$GRIP_LT_AGE"
 GRIP_LT_LDFLAGS="-version-info $GRIP_LT_VERSION"
 
@@ -11416,12 +11416,12 @@
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.19.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.19.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.19.7" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.8" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11432,12 +11432,12 @@
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.19.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.19.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.19.7" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.8" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11457,14 +11457,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.19.7" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= 3.0.8" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.19.7" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= 3.0.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-2.0 >= 2.19.7) were not met:
+	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0.8) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -11508,12 +11508,12 @@
     pkg_cv_GEIS_CFLAGS="$GEIS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutouch-geis >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libutouch-geis >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutouch-geis >= 2.1.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libutouch-geis >= 2.1.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GEIS_CFLAGS=`$PKG_CONFIG --cflags "libutouch-geis >= 0.3" 2>/dev/null`
+  pkg_cv_GEIS_CFLAGS=`$PKG_CONFIG --cflags "libutouch-geis >= 2.1.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11524,12 +11524,12 @@
     pkg_cv_GEIS_LIBS="$GEIS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutouch-geis >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libutouch-geis >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutouch-geis >= 2.1.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libutouch-geis >= 2.1.1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GEIS_LIBS=`$PKG_CONFIG --libs "libutouch-geis >= 0.3" 2>/dev/null`
+  pkg_cv_GEIS_LIBS=`$PKG_CONFIG --libs "libutouch-geis >= 2.1.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11549,14 +11549,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libutouch-geis >= 0.3" 2>&1`
+	        GEIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libutouch-geis >= 2.1.1" 2>&1`
         else
-	        GEIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libutouch-geis >= 0.3" 2>&1`
+	        GEIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libutouch-geis >= 2.1.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEIS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libutouch-geis >= 0.3) were not met:
+	as_fn_error $? "Package requirements (libutouch-geis >= 2.1.1) were not met:
 
 $GEIS_PKG_ERRORS
 
@@ -11691,7 +11691,7 @@
 if test "${enable_maintainer_flags+set}" = set; then :
   enableval=$enable_maintainer_flags;
 else
-  enable_maintainer_flags=yes
+  enable_maintainer_flags=no
 fi
 
 
@@ -12489,7 +12489,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by grip $as_me 0.1.7, which was
+This file was extended by grip $as_me 0.2.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12555,7 +12555,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-grip config.status 0.1.7
+grip config.status 0.2.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-03-23 18:20:10 +0000
+++ configure.ac	2011-07-11 12:13:41 +0000
@@ -2,8 +2,8 @@
 # shamelessly stolen from clutter-gtk
 #
 m4_define([grip_major_version], [0])
-m4_define([grip_minor_version], [1])
-m4_define([grip_micro_version], [7])
+m4_define([grip_minor_version], [2])
+m4_define([grip_micro_version], [0])
 
 m4_define([grip_api_version],
           [grip_major_version.grip_minor_version])
@@ -71,11 +71,11 @@
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.19.7)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.8)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GEIS, libutouch-geis >= 0.3)
+PKG_CHECK_MODULES(GEIS, libutouch-geis >= 2.1.1)
 AC_SUBST(GEIS_CFLAGS)
 AC_SUBST(GEIS_LIBS)
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-23 18:21:01 +0000
+++ debian/changelog	2011-07-11 12:13:41 +0000
@@ -1,3 +1,10 @@
+libgrip (0.2.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Renamed all packages for consistency
+
+ -- Jussi Pakkanen <[e-mail]>  Mon, 11 Jul 2011 11:37:29 +0300
+
 libgrip (0.1.7-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-03-07 12:53:14 +0000
+++ debian/control	2011-07-11 12:13:41 +0000
@@ -5,13 +5,13 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
-               libglib2.0-dev (>=2.14.0),
-               libgtk2.0-dev (>= 2.21.5-1ubuntu3),
-               libutouch-geis-dev,
+               libglib2.0-dev (>=2.28.6),
+               libgtk-3-dev (>= 3.0.8-0ubuntu1),
+               libutouch-geis-dev (>= 2.1.1),
                gobject-introspection,
                libgirepository1.0-dev,
                gir1.2-glib-2.0,
-               gir1.2-gtk-2.0,
+               gir1.2-gtk-3.0,
                gir1.2-pango-1.0,
                gir1.2-gdkpixbuf-2.0,
                gir1.2-freedesktop
@@ -19,33 +19,36 @@
 Homepage: https://launchpad.net/libgrip
 Vcs-Bzr: https://code.launchpad.net/~utouch-packaging/libgrip/packaging
 
-Package: libgrip-0.1-0
+Package: libgrip0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Shared library providing multitouch gestures to gtk apps.
+Replaces: libgrip-0.1-0
+Description: Shared library providing multitouch gestures to GTK+ apps.
  .
  This package contains shared libraries to be used by applications.
 
-Package: libgrip-0.1-dev
+Package: libgrip-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgrip-0.1-0 (= ${binary:Version}),
+         libgrip0 (= ${binary:Version}),
          pkg-config,
-         libglib2.0-dev (>=2.14.0),
-         libgtk2.0-dev (>= 2.19.7),
+         libglib2.0-dev (>=2.28.6),
+         libgtk-3.0-dev (>= 3.0.8),
          libutouch-geis-dev
-Description: Shared library providing multitouch gestures to gtk apps.
+Replaces: libgrip-0.1-dev
+Description: Shared library providing multitouch gestures to GTK+ apps.
  .
  This package contains files that are needed to build applications.
 
-Package: gir1.2-grip-0.1
+Package: gir1.2-grip
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${gir:Depends}
+Replaces: gir1.2-grip-0.1
 Description: typelib file for libgrip
  .
  This package can be used by other packages using the GIRepository format to

=== renamed file 'debian/gir1.2-grip-0.1.install' => 'debian/gir1.2-grip.install'
--- debian/gir1.2-grip-0.1.install	2011-03-03 16:13:57 +0000
+++ debian/gir1.2-grip.install	2011-07-11 12:13:41 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/Grip-0.1.typelib
+debian/tmp/usr/lib/girepository-1.0/Grip.typelib

=== renamed file 'debian/libgrip-0.1-0.symbols' => 'debian/libbrip0.symbols'
=== renamed file 'debian/libgrip-0.1-dev.install' => 'debian/libgrip-dev.install'
--- debian/libgrip-0.1-dev.install	2011-03-03 16:13:57 +0000
+++ debian/libgrip-dev.install	2011-07-11 12:13:41 +0000
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/lib/*.so
-debian/tmp/usr/share/gir-1.0/Grip-0.1.gir
+debian/tmp/usr/share/gir-1.0/Grip.gir

=== renamed file 'debian/libgrip-0.1-0.install' => 'debian/libgrip0.install'
=== modified file 'examples/rectangle-mover/Makefile.am'
--- examples/rectangle-mover/Makefile.am	2011-02-04 19:08:39 +0000
+++ examples/rectangle-mover/Makefile.am	2011-07-11 12:13:41 +0000
@@ -12,4 +12,4 @@
 	$(GTK_CFLAGS)		\
 	$(MAINTAINER_CFLAGS)
 
-grip_test_LDADD = $(top_builddir)/src/libgrip-0.1.la $(GTK_LIBS)
+grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS)

=== modified file 'examples/rectangle-mover/Makefile.in'
--- examples/rectangle-mover/Makefile.in	2011-03-23 18:20:10 +0000
+++ examples/rectangle-mover/Makefile.in	2011-07-11 12:13:41 +0000
@@ -54,7 +54,7 @@
 am_grip_test_OBJECTS = grip_test-gesture.$(OBJEXT)
 grip_test_OBJECTS = $(am_grip_test_OBJECTS)
 am__DEPENDENCIES_1 =
-grip_test_DEPENDENCIES = $(top_builddir)/src/libgrip-0.1.la \
+grip_test_DEPENDENCIES = $(top_builddir)/src/libgrip.la \
 	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -248,7 +248,7 @@
 	$(GTK_CFLAGS)		\
 	$(MAINTAINER_CFLAGS)
 
-grip_test_LDADD = $(top_builddir)/src/libgrip-0.1.la $(GTK_LIBS)
+grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS)
 all: all-am
 
 .SUFFIXES:

=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2011-01-13 05:50:41 +0000
+++ examples/rectangle-mover/gesture.c	2011-07-11 12:13:41 +0000
@@ -9,17 +9,22 @@
 static gdouble translate[2] = { 200, 200 };
 static gint    in_touch = 0;
 
+static void subscribe_gestures(GripGestureManager *manager, GtkWidget *window, GtkWidget *da);
+
+struct app_data {
+  GripGestureManager *manager;
+  GtkWidget *main_window;
+  GtkWidget *da;
+};
+
 static gboolean
-expose_event (GtkWidget      *widget,
-              GdkEventExpose *event,
-              gpointer        data)
+draw_canvas (GtkWidget *widget,
+             cairo_t   *cr,
+             gpointer   data)
 {
-  cairo_t *cr;
   gdouble radians;
   gint width = (in_touch > 0) ? 10 : 1;
 
-  cr = gdk_cairo_create (widget->window);
-
   cairo_set_source_rgb (cr, 0, 0, 0);
   cairo_set_line_width (cr, width);
 
@@ -33,8 +38,6 @@
   cairo_set_source_rgb (cr, 1, 0, 1);
   cairo_fill (cr);
 
-  cairo_destroy (cr);
-
   return FALSE;
 }
 
@@ -89,6 +92,16 @@
   gtk_widget_queue_draw (GTK_WIDGET (widget));
 }
 
+static void
+subscribe_toggled(GtkToggleButton *toggle_button, gpointer user_data)
+{
+  struct app_data *app = (struct app_data*)(user_data);
+  if (gtk_toggle_button_get_active(toggle_button)) {
+      subscribe_gestures(app->manager, app->main_window, app->da);
+  } else {
+      grip_gesture_manager_unregister_window(app->manager, app->main_window);
+  }
+}
 
 static GtkTreeModel *
 create_model ()
@@ -96,20 +109,61 @@
   return (GtkTreeModel *)gtk_list_store_new (1, G_TYPE_STRING);
 }
 
+/* Change this to suit your needs. */
+#define DEVICE_TYPE GRIP_DEVICE_ALL
+
+static void
+subscribe_gestures(GripGestureManager *manager, GtkWidget *window,
+    GtkWidget *da)
+{
+  grip_gesture_manager_register_window (manager,
+                                        da,
+                                        GRIP_GESTURE_PINCH,
+                                        DEVICE_TYPE,
+                                        2,
+                                        gesture_callback,
+                                        NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+                                        da,
+                                        GRIP_GESTURE_ROTATE,
+                                        DEVICE_TYPE,
+                                        2,
+                                        gesture_callback,
+                                        NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+                                        da,
+                                        GRIP_GESTURE_DRAG,
+                                        DEVICE_TYPE,
+                                        2,
+                                        gesture_callback,
+                                        NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+                                        da,
+                                        GRIP_GESTURE_TAP,
+                                        DEVICE_TYPE,
+                                        2,
+                                        gesture_callback,
+                                        NULL, NULL);
+}
+
 static GtkWidget *
-create_window (GripGestureManager *manager)
+create_window (struct app_data *app)
 {
-  GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  GtkWidget *da;
+  app->main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  GtkWidget *window = app->main_window;
   GtkWidget *hbox;
   GtkWidget *vbox;
   GtkWidget *button;
+  GtkWidget *subscribed_toggle;
   GtkWidget *tv;
   GtkTreeModel *model;
   GtkWidget *sw;
   const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
 
-  da = gtk_drawing_area_new ();
+  app->da = gtk_drawing_area_new ();
 
   gtk_window_set_title (GTK_WINDOW (window), "Touch Demo");
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 600);
@@ -120,7 +174,7 @@
   vbox = gtk_vbox_new (FALSE, 0);
 
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), da, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), app->da, TRUE, TRUE, 0);
 
   model = create_model ();
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -136,44 +190,23 @@
                     "clicked",
                     G_CALLBACK (gtk_main_quit),
                     NULL);
-
+  subscribed_toggle = gtk_toggle_button_new_with_label ("Gestures");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(subscribed_toggle), TRUE);
+  g_signal_connect (subscribed_toggle,
+                    "toggled",
+                    G_CALLBACK (subscribe_toggled),
+                    app);
+  gtk_box_pack_start (GTK_BOX (vbox), subscribed_toggle, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
-  gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &white);
-
-  g_signal_connect (da, "expose-event",
-                    G_CALLBACK (expose_event), NULL);
-
-  grip_gesture_manager_register_window (manager,
-                                        da,
-                                        GRIP_GESTURE_PINCH,
-                                        2,
-                                        gesture_callback,
-                                        NULL, NULL);
-
-  grip_gesture_manager_register_window (manager,
-                                        da,
-                                        GRIP_GESTURE_ROTATE,
-                                        2,
-                                        gesture_callback,
-                                        NULL, NULL);
-
-  grip_gesture_manager_register_window (manager,
-                                        da,
-                                        GRIP_GESTURE_DRAG,
-                                        2,
-                                        gesture_callback,
-                                        NULL, NULL);
-
-  grip_gesture_manager_register_window (manager,
-                                        da,
-                                        GRIP_GESTURE_TAP,
-                                        2,
-                                        gesture_callback,
-                                        NULL, NULL);
-
+  gtk_widget_modify_bg (app->da, GTK_STATE_NORMAL, &white);
+
+  g_signal_connect (app->da, "draw",
+                    G_CALLBACK (draw_canvas), NULL);
+
+  subscribe_gestures(app->manager, window, app->da);
   return window;
 }
 
@@ -188,8 +221,7 @@
 int
 main (int argc, char **argv)
 {
-  GtkWidget *window;
-  GripGestureManager *manager;
+  struct app_data app;
 
   gtk_init (&argc, &argv);
 
@@ -197,12 +229,12 @@
    * my Dell XT2 has in it. */
   signal (SIGABRT, abort_handler);
 
-  manager = grip_gesture_manager_get ();
-  window = create_window (manager);
-
-  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
-
-  gtk_widget_show_all (GTK_WIDGET (window));
+  app.manager = grip_gesture_manager_get ();
+  create_window (&app);
+
+  g_signal_connect (app.main_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+
+  gtk_widget_show_all (GTK_WIDGET (app.main_window));
 
   gtk_main ();
 

=== modified file 'libgrip.pc.in'
--- libgrip.pc.in	2011-03-04 19:15:32 +0000
+++ libgrip.pc.in	2011-07-11 12:13:41 +0000
@@ -6,6 +6,6 @@
 Name: libgrip
 Description: Multitouch gesture library
 Version: @VERSION@
-Libs: -L${libdir} -lgrip-0.1
-Cflags: -I${includedir}/libgrip-0.1
-Requires: gtk+-2.0
+Libs: -L${libdir} -lgrip
+Cflags: -I${includedir}
+Requires: gtk+-3.0

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-03-06 15:19:16 +0000
+++ src/Makefile.am	2011-07-11 12:13:41 +0000
@@ -1,5 +1,5 @@
 grip_version_script =			\
-	$(srcdir)/libgrip-0.1.ver
+	$(srcdir)/libgrip.ver
 
 grip_built_public_sources =		\
 	griptypebuiltins.h
@@ -38,21 +38,21 @@
 introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))
 
 irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
-Grip-0.1.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
+Grip.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
 	$(INTROSPECTION_SCANNER)						\
 		-v --namespace Grip						\
-		--nsversion=0.1							\
+		--nsversion=0.2							\
 		--warn-all							\
 		--libtool=$(top_builddir)/libtool				\
 		--add-include-path=$(srcdir) $(GTK_CFLAGS)			\
 		--include=GObject-2.0						\
 		--include=GLib-2.0						\
 		--include=Gtk-2.0						\
-		--library=grip-0.1						\
-		--output Grip-0.1.gir $(irscanner_headers)			\
+		--library=grip							\
+		--output Grip.gir $(irscanner_headers)			\
 		$(addprefix --c-include=src/, $(grip_headers))
 
-BUILT_GIRSOURCES += Grip-0.1.gir
+BUILT_GIRSOURCES += Grip.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)
@@ -90,26 +90,26 @@
 	$(GEIS_CFLAGS)			\
 	$(MAINTAINER_CFLAGS)
 
-lib_LTLIBRARIES = libgrip-0.1.la
+lib_LTLIBRARIES = libgrip.la
 
-libgrip_0_1_la_SOURCES =		\
+libgrip_la_SOURCES =			\
 	gripgesturemanager.c		\
 	griptypebuiltins.c
 
-libgripincludedir=$(includedir)/libgrip-0.1/libgrip
+libgripincludedir=$(includedir)/libgrip
 
 libgripinclude_HEADERS =		\
 	gripgesturemanager.h		\
 	grip.h
 
-libgrip_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
-libgrip_0_1_la_LDFLAGS =				\
+libgrip_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
+libgrip_la_LDFLAGS =					\
 	-Wl,-z,defs -Wl,--as-needed			\
 	-Wl,--version-script=$(grip_version_script)	\
 	$(GRIP_LT_LDFLAGS)				\
 	$(GTK_LT_LDFLAGS)
 
-gripheadersdir = $(includedir)/grip-0.1/grip
+gripheadersdir = $(includedir)/grip
 
 DISTCLEANFILES =			\
 	stamp-griptypebuiltins.h	\

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-03-23 18:20:10 +0000
+++ src/Makefile.in	2011-07-11 12:13:41 +0000
@@ -77,17 +77,15 @@
 	"$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libgripincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libgrip_0_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_libgrip_0_1_la_OBJECTS = gripgesturemanager.lo griptypebuiltins.lo
-libgrip_0_1_la_OBJECTS = $(am_libgrip_0_1_la_OBJECTS)
+libgrip_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_libgrip_la_OBJECTS = gripgesturemanager.lo griptypebuiltins.lo
+libgrip_la_OBJECTS = $(am_libgrip_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-libgrip_0_1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libgrip_0_1_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
+libgrip_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libgrip_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -114,8 +112,8 @@
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libgrip_0_1_la_SOURCES)
-DIST_SOURCES = $(libgrip_0_1_la_SOURCES)
+SOURCES = $(libgrip_la_SOURCES)
+DIST_SOURCES = $(libgrip_la_SOURCES)
 DATA = $(gir_DATA) $(typelibs_DATA)
 HEADERS = $(libgripinclude_HEADERS)
 ETAGS = etags
@@ -269,7 +267,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 grip_version_script = \
-	$(srcdir)/libgrip-0.1.ver
+	$(srcdir)/libgrip.ver
 
 grip_built_public_sources = \
 	griptypebuiltins.h
@@ -287,7 +285,7 @@
 	$(grip_version_script)
 
 CLEANFILES = $(am__append_1)
-@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = Grip-0.1.gir
+@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = Grip.gir
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))
 @HAVE_INTROSPECTION_TRUE@irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
@@ -311,24 +309,24 @@
 	$(GEIS_CFLAGS)			\
 	$(MAINTAINER_CFLAGS)
 
-lib_LTLIBRARIES = libgrip-0.1.la
-libgrip_0_1_la_SOURCES = \
+lib_LTLIBRARIES = libgrip.la
+libgrip_la_SOURCES = \
 	gripgesturemanager.c		\
 	griptypebuiltins.c
 
-libgripincludedir = $(includedir)/libgrip-0.1/libgrip
+libgripincludedir = $(includedir)/libgrip
 libgripinclude_HEADERS = \
 	gripgesturemanager.h		\
 	grip.h
 
-libgrip_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
-libgrip_0_1_la_LDFLAGS = \
+libgrip_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
+libgrip_la_LDFLAGS = \
 	-Wl,-z,defs -Wl,--as-needed			\
 	-Wl,--version-script=$(grip_version_script)	\
 	$(GRIP_LT_LDFLAGS)				\
 	$(GTK_LT_LDFLAGS)
 
-gripheadersdir = $(includedir)/grip-0.1/grip
+gripheadersdir = $(includedir)/grip
 DISTCLEANFILES = \
 	stamp-griptypebuiltins.h	\
 	griptypebuiltins.h		\
@@ -399,8 +397,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgrip-0.1.la: $(libgrip_0_1_la_OBJECTS) $(libgrip_0_1_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libgrip_0_1_la_LINK) -rpath $(libdir) $(libgrip_0_1_la_OBJECTS) $(libgrip_0_1_la_LIBADD) $(LIBS)
+libgrip.la: $(libgrip_la_OBJECTS) $(libgrip_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libgrip_la_LINK) -rpath $(libdir) $(libgrip_la_OBJECTS) $(libgrip_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -722,18 +720,18 @@
 	( cd $(srcdir) && $(GLIB_MKENUMS) --template griptypebuiltins.c.in			\
 	  $(sources_h) ) > xgen-gtbc								\
 	&& cp xgen-gtbc griptypebuiltins.c && rm -f xgen-gtbc
-@[e-mail]: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
+@[e-mail]: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
 @HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_SCANNER)						\
 @HAVE_INTROSPECTION_TRUE@		-v --namespace Grip						\
-@HAVE_INTROSPECTION_TRUE@		--nsversion=0.1							\
+@HAVE_INTROSPECTION_TRUE@		--nsversion=0.2							\
 @HAVE_INTROSPECTION_TRUE@		--warn-all							\
 @HAVE_INTROSPECTION_TRUE@		--libtool=$(top_builddir)/libtool				\
 @HAVE_INTROSPECTION_TRUE@		--add-include-path=$(srcdir) $(GTK_CFLAGS)			\
 @HAVE_INTROSPECTION_TRUE@		--include=GObject-2.0						\
 @HAVE_INTROSPECTION_TRUE@		--include=GLib-2.0						\
 @HAVE_INTROSPECTION_TRUE@		--include=Gtk-2.0						\
-@HAVE_INTROSPECTION_TRUE@		--library=grip-0.1						\
-@HAVE_INTROSPECTION_TRUE@		--output Grip-0.1.gir $(irscanner_headers)			\
+@HAVE_INTROSPECTION_TRUE@		--library=grip							\
+@HAVE_INTROSPECTION_TRUE@		--output Grip.gir $(irscanner_headers)			\
 @HAVE_INTROSPECTION_TRUE@		$(addprefix --c-include=src/, $(grip_headers))
 @HAVE_INTROSPECTION_TRUE@%.typelib: %.gir $(INTROSPECTION_COMPILER)
 @HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_COMPILER)			\

=== modified file 'src/grip.h'
--- src/grip.h	2010-11-22 14:49:44 +0000
+++ src/grip.h	2011-07-11 12:13:41 +0000
@@ -23,9 +23,9 @@
  *    Cody Russell <[e-mail]>
  */
 
-#ifndef __GRIP_H__
-#define __GRIP_H__
+#ifndef GRIP_H
+#define GRIP_H
 
 #include <libgrip/gripgesturemanager.h>
 
-#endif /* __GRIP_H__ */
+#endif /* GRIP_H */

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-03-23 15:17:02 +0000
+++ src/gripgesturemanager.c	2011-07-11 12:13:41 +0000
@@ -32,10 +32,23 @@
 typedef struct _GripGestureBinding      GripGestureBinding;
 typedef struct _GripRegistrationRequest GripRegistrationRequest;
 
+typedef struct {
+  GArray *touchscreen;
+  GArray *touchpad;
+  GArray *independent;
+} GripDevices;
+
+struct Registrations {
+  GripGestureRegistration *touchscreen;
+  GripGestureRegistration *touchpad;
+  GripGestureRegistration *independent;
+};
+
 struct _GripGestureManagerPrivate
 {
-  GHashTable *hash;
+  GHashTable *registered_windows;
   GList      *requests;
+  GripDevices devices;
 };
 
 struct _GripGestureBinding
@@ -62,6 +75,7 @@
   GripGestureManager *manager;
   GtkWidget          *widget;
   GripGestureType     gesture_type;
+  GripDeviceType      device_type;
   gint                touch_points;
   GripGestureCallback callback;
   gpointer            user_data;
@@ -134,6 +148,74 @@
   gesture_finish
 };
 
+static void device_added (void *cookie, GeisInputDeviceId id, void *attrs)
+{
+  GripDevices *devices = (GripDevices *) cookie;
+  GeisGestureAttr *a;
+  gboolean direct = FALSE;
+  gboolean independent = FALSE;
+  
+  for (a = attrs; a->name; a++)
+    {
+      if (g_strcmp0(GEIS_DEVICE_ATTRIBUTE_DIRECT_TOUCH, a->name) == 0)
+          direct = a->boolean_val;
+      else if (g_strcmp0(GEIS_DEVICE_ATTRIBUTE_INDEPENDENT_TOUCH, a->name) == 0)
+          independent = a->boolean_val;
+    }
+
+  if (direct && !independent)
+    g_array_append_val (devices->touchscreen, id);
+  else if (!direct && !independent)
+    g_array_append_val (devices->touchpad, id);
+  else if (!direct && independent)
+    g_array_append_val (devices->independent, id);
+}
+
+static GeisInputFuncs input_funcs = {
+  device_added,
+  NULL,
+  NULL,
+};
+
+static void
+grip_get_devices (GripDevices *devices)
+{
+  GeisXcbWinInfo xcb_win_info = {
+    .display_name = NULL,
+    .screenp = NULL,
+    .window_id = 0,
+  };
+  GeisWinInfo win_info = {
+    GEIS_XCB_FULL_WINDOW,
+    &xcb_win_info,
+  };
+  GeisInstance instance;
+  GeisStatus status;
+
+  status = geis_init (&win_info, &instance);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    g_warning ("failed to determine device types\n");
+    return;
+  }
+
+  status = geis_input_devices (instance, &input_funcs, devices);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    g_warning ("failed to determine device types\n");
+    return;
+  }
+
+  status = geis_event_dispatch (instance);
+  if (status != GEIS_STATUS_SUCCESS)
+  {
+    g_warning ("failed to determine device types\n");
+    return;
+  }
+
+  geis_finish (instance);
+}
+
 G_DEFINE_TYPE (GripGestureManager, grip_gesture_manager, G_TYPE_OBJECT)
 
 #define GRIP_GESTURE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRIP_TYPE_GESTURE_MANAGER, GripGestureManagerPrivate))
@@ -143,16 +225,17 @@
 {
 }
 
+
 static void
-free_registration (gpointer key,
-		   gpointer value,
-		   gpointer user_data)
+free_registration(GripGestureRegistration *reg)
 {
-  GripGestureRegistration *reg = (GripGestureRegistration *)value;
   GList *tmp = NULL;
 
+  if (!reg)
+    return;
+
   geis_unsubscribe (reg->instance,
-		    (GeisGestureType*)reg->gesture_list->pdata);
+      (GeisGestureType*)reg->gesture_list->pdata);
 
   /* We don't need to free the values in the GPtrArray. */
   g_ptr_array_free (reg->gesture_list, TRUE);
@@ -165,19 +248,36 @@
   g_list_free (reg->bindings);
 }
 
+/* Helper function needed to make things work with GTK. */
+
+static void
+free_registration_adapter (gpointer key,
+                   gpointer value,
+                   gpointer user_data)
+{
+  struct Registrations *regs = (struct Registrations *)value;
+  free_registration(regs->touchscreen);
+  free_registration(regs->touchpad);
+  free_registration(regs->independent);
+}
+
 static void
 grip_gesture_manager_finalize (GObject *object)
 {
   GripGestureManagerPrivate *priv = GRIP_GESTURE_MANAGER_GET_PRIVATE (object);
 
-  if (priv->hash != NULL)
+  if (priv->registered_windows != NULL)
     {
-      g_hash_table_foreach (priv->hash,
-			    free_registration,
+      g_hash_table_foreach (priv->registered_windows,
+			    free_registration_adapter,
 			    NULL);
 
-      g_hash_table_unref (priv->hash);
-      priv->hash = NULL;
+      g_hash_table_unref (priv->registered_windows);
+      priv->registered_windows = NULL;
+
+      g_array_unref (priv->devices.touchscreen);
+      g_array_unref (priv->devices.touchpad);
+      g_array_unref (priv->devices.independent);
     }
 }
 
@@ -187,6 +287,7 @@
                                   GObjectConstructParam *params)
 {
   GObject *object;
+  GripGestureManagerPrivate *priv;
 
   if (manager_singleton != NULL)
     {
@@ -200,6 +301,9 @@
 
       manager_singleton = GRIP_GESTURE_MANAGER (object);
       g_object_add_weak_pointer (object, (gpointer) &manager_singleton);
+
+      priv = manager_singleton->priv;
+      grip_get_devices (&priv->devices);
     }
 
   return object;
@@ -489,6 +593,127 @@
   return (x >= ax && x < ax + alloc.width && y >= ay && y < ay + alloc.height);
 }
 
+
+static void process_gesture (void         *cookie,
+	               GeisGestureType    type,
+	               GeisGestureId      id,
+	               GeisSize           attr_count,
+	               GeisGestureAttr   *attrs,
+	               GripTimeType       time_type)
+{
+  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
+  GList *l = NULL;
+
+  for (l = reg->bindings; l != NULL; l = l->next)
+    {
+      GripGestureBinding *binding = (GripGestureBinding *)l->data;
+
+      if (binding->type == type)
+        {
+	  GripGestureEvent *event = grip_gesture_event_new (type);
+
+          if (type == GRIP_GESTURE_DRAG)
+            {
+              GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
+
+              drag->type    = type;
+              drag->id      = id;
+              drag->fingers = drag_gesture_handle_properties (drag,
+                  attr_count,
+                  attrs);
+
+              if (drag->fingers == binding->touches)
+                {
+                  if (matches_widget (binding->widget,
+                                      gtk_widget_get_window(GTK_WIDGET (reg->window)),
+                                      (gint)drag->focus_x,
+                                      (gint)drag->focus_y))
+                    {
+                      binding->callback (binding->widget,
+                                         time_type,
+                                         event,
+                                         binding->data);
+                    }
+                }
+            }
+          else if (type == GRIP_GESTURE_PINCH)
+            {
+              GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
+
+              pinch->type    = type;
+              pinch->id      = id;
+              pinch->fingers = pinch_gesture_handle_properties (pinch,
+                  attr_count,
+                  attrs);
+
+              if (pinch->fingers == binding->touches)
+                {
+                  if (matches_widget (binding->widget,
+                                      gtk_widget_get_window(GTK_WIDGET(reg->window)),
+                                      (gint)pinch->focus_x,
+                                      (gint)pinch->focus_y))
+                    {
+                      binding->callback (binding->widget,
+                                         time_type,
+                                         event,
+                                         binding->data);
+                    }
+                }
+            }
+          else if (type == GRIP_GESTURE_ROTATE)
+            {
+              GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
+
+              rotate->type    = type;
+              rotate->id      = id;
+              rotate->fingers = rotate_gesture_handle_properties (rotate,
+                  attr_count,
+                  attrs);
+
+              if (rotate->fingers == binding->touches)
+                {
+                  if (matches_widget (binding->widget,
+                                      gtk_widget_get_window(GTK_WIDGET (reg->window)),
+                                      (gint)rotate->focus_x,
+                                      (gint)rotate->focus_y))
+                    {
+                      binding->callback (binding->widget,
+                                         time_type,
+                                         event,
+                                         binding->data);
+                    }
+                }
+            }
+          else if (type == GRIP_GESTURE_TAP)
+            {
+              GripEventGestureTap *tap = (GripEventGestureTap *)event;
+
+              tap->type    = type;
+              tap->id      = id;
+              tap->fingers = tap_gesture_handle_properties (tap,
+                  attr_count,
+                  attrs);
+
+              if (tap->fingers == binding->touches)
+                {
+                  if (matches_widget (binding->widget,
+                                      gtk_widget_get_window(GTK_WIDGET (reg->window)),
+                                      (gint)tap->focus_x,
+                                      (gint)tap->focus_y))
+                    {
+                      binding->callback (binding->widget,
+                                         time_type,
+                                         event,
+                                         binding->data);
+                    }
+                }
+            }
+
+          grip_gesture_event_free (event);
+        }
+    }
+}
+
 static void
 gesture_start (void              *cookie,
                GeisGestureType    type,
@@ -496,117 +721,7 @@
                GeisSize           attr_count,
                GeisGestureAttr   *attrs)
 {
-  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
-  GList *l = NULL;
-
-  for (l = reg->bindings; l != NULL; l = l->next)
-    {
-      GripGestureBinding *binding = (GripGestureBinding *)l->data;
-
-      if (binding->type == type)
-        {
-	  GripGestureEvent *event = grip_gesture_event_new (type);
-
-          if (type == GRIP_GESTURE_DRAG)
-            {
-              GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
-
-              drag->type    = type;
-              drag->id      = id;
-              drag->fingers = drag_gesture_handle_properties (drag,
-							      attr_count,
-							      attrs);
-
-              if (drag->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)drag->focus_x,
-                                      (gint)drag->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_START,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_PINCH)
-            {
-              GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
-
-              pinch->type    = type;
-              pinch->id      = id;
-              pinch->fingers = pinch_gesture_handle_properties (pinch,
-								attr_count,
-								attrs);
-
-              if (pinch->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)pinch->focus_x,
-                                      (gint)pinch->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_START,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_ROTATE)
-            {
-              GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
-
-              rotate->type    = type;
-              rotate->id      = id;
-              rotate->fingers = rotate_gesture_handle_properties (rotate,
-								  attr_count,
-								  attrs);
-
-              if (rotate->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)rotate->focus_x,
-                                      (gint)rotate->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_START,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-	  else if (type == GRIP_GESTURE_TAP)
-	    {
-	      GripEventGestureTap *tap = (GripEventGestureTap *)event;
-
-	      tap->type    = type;
-	      tap->id      = id;
-	      tap->fingers = tap_gesture_handle_properties (tap,
-							    attr_count,
-							    attrs);
-
-	      if (tap->fingers == binding->touches)
-		{
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)tap->focus_x,
-                                      (gint)tap->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_START,
-                                         event,
-                                         binding->data);
-                    }
-                }
-	    }
-
-	  grip_gesture_event_free (event);
-        }
-    }
+  process_gesture(cookie, type, id, attr_count, attrs, GRIP_TIME_START);
 }
 
 static void
@@ -616,117 +731,7 @@
                 GeisSize           attr_count,
                 GeisGestureAttr   *attrs)
 {
-  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
-  GList *l = NULL;
-
-  for (l = reg->bindings; l != NULL; l = l->next)
-    {
-      GripGestureBinding *binding = (GripGestureBinding *)l->data;
-
-      if (binding->type == type)
-        {
-	  GripGestureEvent *event = grip_gesture_event_new (type);
-
-          if (type == GRIP_GESTURE_DRAG)
-            {
-              GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
-
-              drag->type    = type;
-              drag->id      = id;
-              drag->fingers = drag_gesture_handle_properties (drag,
-							      attr_count,
-							      attrs);
-
-              if (drag->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)drag->focus_x,
-                                      (gint)drag->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_UPDATE,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_PINCH)
-            {
-              GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
-
-              pinch->type    = type;
-              pinch->id      = id;
-              pinch->fingers = pinch_gesture_handle_properties (pinch,
-								attr_count,
-								attrs);
-
-              if (pinch->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)pinch->focus_x,
-                                      (gint)pinch->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_UPDATE,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_ROTATE)
-            {
-              GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
-
-              rotate->type    = type;
-              rotate->id      = id;
-              rotate->fingers = rotate_gesture_handle_properties (rotate,
-								  attr_count,
-								  attrs);
-
-              if (rotate->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)rotate->focus_x,
-                                      (gint)rotate->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_UPDATE,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-	  else if (type == GRIP_GESTURE_TAP)
-	    {
-	      GripEventGestureTap *tap = (GripEventGestureTap *)event;
-
-	      tap->type    = type;
-	      tap->id      = id;
-	      tap->fingers = tap_gesture_handle_properties (tap,
-							    attr_count,
-							    attrs);
-
-	      if (tap->fingers == binding->touches)
-		{
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)tap->focus_x,
-                                      (gint)tap->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_UPDATE,
-                                         event,
-                                         binding->data);
-                    }
-                }
-	    }
-
-	  grip_gesture_event_free (event);
-        }
-    }
+  process_gesture(cookie, type, id, attr_count, attrs, GRIP_TIME_UPDATE);
 }
 
 static void
@@ -736,117 +741,7 @@
                 GeisSize           attr_count,
                 GeisGestureAttr   *attrs)
 {
-  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
-  GList *l = NULL;
-
-  for (l = reg->bindings; l != NULL; l = l->next)
-    {
-      GripGestureBinding *binding = (GripGestureBinding *)l->data;
-
-      if (binding->type == type)
-        {
-	  GripGestureEvent *event = grip_gesture_event_new (type);
-
-          if (type == GRIP_GESTURE_DRAG)
-            {
-              GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
-
-              drag->type    = type;
-              drag->id      = id;
-              drag->fingers = drag_gesture_handle_properties (drag,
-							      attr_count,
-							      attrs);
-
-              if (drag->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)drag->focus_x,
-                                      (gint)drag->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_END,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_PINCH)
-            {
-              GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
-
-              pinch->type    = type;
-              pinch->id      = id;
-              pinch->fingers = pinch_gesture_handle_properties (pinch,
-								attr_count,
-								attrs);
-
-              if (pinch->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)pinch->focus_x,
-                                      (gint)pinch->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_END,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-          else if (type == GRIP_GESTURE_ROTATE)
-            {
-              GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
-
-              rotate->type    = type;
-              rotate->id      = id;
-              rotate->fingers = rotate_gesture_handle_properties (rotate,
-								  attr_count,
-								  attrs);
-
-              if (rotate->fingers == binding->touches)
-                {
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)rotate->focus_x,
-                                      (gint)rotate->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_END,
-                                         event,
-                                         binding->data);
-                    }
-                }
-            }
-	  else if (type == GRIP_GESTURE_TAP)
-	    {
-	      GripEventGestureTap *tap = (GripEventGestureTap *)event;
-
-	      tap->type    = type;
-	      tap->id      = id;
-	      tap->fingers = tap_gesture_handle_properties (tap,
-							    attr_count,
-							    attrs);
-
-	      if (tap->fingers == binding->touches)
-		{
-                  if (matches_widget (binding->widget,
-                                      GTK_WIDGET (reg->window)->window,
-                                      (gint)tap->focus_x,
-                                      (gint)tap->focus_y))
-                    {
-                      binding->callback (binding->widget,
-                                         GRIP_TIME_END,
-                                         event,
-                                         binding->data);
-                    }
-                }
-	    }
-
-	  grip_gesture_event_free (event);
-        }
-    }
+  process_gesture(cookie, type, id, attr_count, attrs, GRIP_TIME_END);
 }
 
 static void
@@ -856,7 +751,14 @@
 
   priv = item->priv = GRIP_GESTURE_MANAGER_GET_PRIVATE (item);
 
-  priv->hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+  priv->registered_windows = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+  priv->devices.touchscreen = g_array_new (FALSE, FALSE,
+                                           sizeof(GeisInputDeviceId));
+  priv->devices.touchpad = g_array_new (FALSE, FALSE,
+                                        sizeof(GeisInputDeviceId));
+  priv->devices.independent = g_array_new (FALSE, FALSE,
+                                            sizeof(GeisInputDeviceId));
 }
 
 static gboolean
@@ -872,12 +774,8 @@
 }
 
 static void
-window_destroyed_cb (GtkObject *object,
-                     gpointer   user_data)
+destroy_registration(GripGestureRegistration *reg)
 {
-  GripGestureManager *manager = (GripGestureManager *)user_data;
-  GripGestureManagerPrivate *priv = manager->priv;
-  GripGestureRegistration *reg = g_hash_table_lookup (priv->hash, object);
   GList *list;
 
   for (list = reg->bindings; list != NULL; list = list->next)
@@ -895,12 +793,23 @@
     }
 
   g_list_free (reg->bindings);
-
   g_io_channel_shutdown (reg->iochannel, TRUE, NULL);
-
   geis_finish (reg->instance);
-
-  g_hash_table_remove (priv->hash, object);
+}
+
+static void
+window_destroyed_cb (GtkWidget *object,
+                     gpointer   user_data)
+{
+  GripGestureManager *manager = (GripGestureManager *)user_data;
+  GripGestureManagerPrivate *priv = manager->priv;
+  struct Registrations *reg = g_hash_table_lookup (priv->registered_windows, object);
+
+  destroy_registration(reg->touchpad);
+  destroy_registration(reg->touchscreen);
+  destroy_registration(reg->independent);
+
+  g_hash_table_remove (priv->registered_windows, object);
   g_free (reg);
 }
 
@@ -924,104 +833,141 @@
 }
 
 static void
-register_internal (GripGestureManager *manager,
-                   GtkWidget          *widget,
-                   GripGestureType     gesture_type,
-                   gint                touch_points,
-                   GripGestureCallback callback,
-                   gpointer            user_data,
-                   GDestroyNotify      destroy)
-{
-  GripGestureManagerPrivate *priv;
+grip_devices_for_type (GripDeviceType type, GArray *selection,
+                       GripDevices *devices)
+{
+  GeisInputDeviceId id;
+  int i;
+
+  if (type & GRIP_DEVICE_TOUCHSCREEN)
+    {
+      for (i = 0; i < devices->touchscreen->len; i++)
+        {
+          id = g_array_index (devices->touchscreen, GeisInputDeviceId, i);
+          g_array_append_val (selection, id);
+        }
+    }
+  if (type & GRIP_DEVICE_TOUCHPAD)
+    {
+      for (i = 0; i < devices->touchpad->len; i++)
+        {
+          id = g_array_index (devices->touchpad, GeisInputDeviceId, i);
+          g_array_append_val (selection, id);
+        }
+    }
+  if (type & GRIP_DEVICE_INDEPENDENT)
+    {
+      for (i = 0; i < devices->independent->len; i++)
+        {
+          id = g_array_index (devices->independent, GeisInputDeviceId, i);
+          g_array_append_val (selection, id);
+        }
+    }
+}
+
+static GripGestureRegistration* new_window_registration(GripGestureManager *manager,
+    GtkWidget *toplevel)
+{
   GripGestureRegistration *reg;
+  GeisInstance  instance;
+  GIOChannel   *iochannel;
+  gint fd = -1;
+  GeisXcbWinInfo xcb_win_info = {
+    .display_name = NULL,
+    .screenp      = NULL,
+    .window_id    = GDK_WINDOW_XID (gtk_widget_get_window(toplevel))
+  };
+  GeisWinInfo win_info = {
+    GEIS_XCB_FULL_WINDOW,
+    &xcb_win_info
+  };
+
+  if (geis_init (&win_info, &instance) != GEIS_STATUS_SUCCESS)
+    {
+      g_warning ("Failed to initialize gesture manager.");
+      return NULL;
+    }
+
+  if (geis_configuration_supported (instance,
+                                    GEIS_CONFIG_UNIX_FD) != GEIS_STATUS_SUCCESS)
+    {
+      g_warning ("Gesture manager does not support UNIX fd.");
+      return NULL;
+    }
+
+  if (geis_configuration_get_value (instance,
+                                    GEIS_CONFIG_UNIX_FD,
+                                    &fd) != GEIS_STATUS_SUCCESS)
+    {
+      g_error ("Gesture manager failed to obtain UNIX fd.");
+      return NULL;
+    }
+
+  reg = g_new0 (GripGestureRegistration, 1);
+
+  reg->window   = GTK_WINDOW (toplevel);
+  reg->instance = instance;
+
+  g_signal_connect (toplevel,
+                    "destroy",
+                    G_CALLBACK (window_destroyed_cb),
+                    manager);
+
+  iochannel = g_io_channel_unix_new (fd);
+  g_io_add_watch (iochannel,
+                  G_IO_IN,
+                  io_callback,
+                  reg);
+
+  reg->iochannel = iochannel;
+
+  reg->gesture_list = g_ptr_array_new ();
+
+  return reg;
+}
+
+static void
+bind_registration(GripGestureManager *manager,
+    GripGestureRegistration *reg,
+    GtkWidget               *widget,
+    GripGestureType         gesture_type,
+    GripDeviceType          device_type,
+    gint                    touch_points,
+    GripGestureCallback     callback,
+    gpointer                user_data,
+    GDestroyNotify          destroy)
+{
+  GripGestureManagerPrivate *priv;
   GripGestureBinding *binding;
-  GtkWidget *toplevel;
-
-  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  toplevel = gtk_widget_get_toplevel (widget);
-
-  g_return_if_fail (GTK_IS_WINDOW (toplevel));
+  GArray *devices;
 
   priv = manager->priv;
 
-  if (!(reg = g_hash_table_lookup (priv->hash, toplevel)))
-    {
-      GeisInstance  instance;
-      GIOChannel   *iochannel;
-      gint fd = -1;
-      GeisXcbWinInfo xcb_win_info = {
-        .display_name = NULL,
-        .screenp      = NULL,
-        .window_id    = GDK_DRAWABLE_XID (toplevel->window)
-      };
-      GeisWinInfo win_info = {
-        GEIS_XCB_FULL_WINDOW,
-        &xcb_win_info
-      };
-
-      if (geis_init (&win_info, &instance) != GEIS_STATUS_SUCCESS)
-        {
-          g_warning ("Failed to initialize gesture manager.");
-          return;
-        }
-
-      if (geis_configuration_supported (instance,
-                                        GEIS_CONFIG_UNIX_FD) != GEIS_STATUS_SUCCESS)
-        {
-          g_warning ("Gesture manager does not support UNIX fd.");
-          return;
-        }
-
-      if (geis_configuration_get_value (instance,
-                                        GEIS_CONFIG_UNIX_FD,
-                                        &fd) != GEIS_STATUS_SUCCESS)
-        {
-          g_error ("Gesture manager failed to obtain UNIX fd.");
-          return;
-        }
-
-      reg = g_new0 (GripGestureRegistration, 1);
-
-      reg->window   = GTK_WINDOW (toplevel);
-      reg->instance = instance;
-
-      g_signal_connect (toplevel,
-                        "destroy",
-                        G_CALLBACK (window_destroyed_cb),
-                        manager);
-
-      iochannel = g_io_channel_unix_new (fd);
-      g_io_add_watch (iochannel,
-                      G_IO_IN,
-                      io_callback,
-                      reg);
-
-      reg->iochannel = iochannel;
-
-      reg->gesture_list = g_ptr_array_new ();
-    }
-  else
-    {
-      geis_unsubscribe (reg->instance,
-			(GeisGestureType*)reg->gesture_list->pdata);
-    }
 
   if (reg->gesture_list->len)
     g_ptr_array_remove_index (reg->gesture_list,
-			      reg->gesture_list->len - 1);
-
-  g_ptr_array_add (reg->gesture_list,
-		   (gchar *)grip_type_to_geis_type (gesture_type, touch_points));
-  g_ptr_array_add (reg->gesture_list,
-		   NULL);
+                              reg->gesture_list->len - 1);
+
+  devices = g_array_new (TRUE, FALSE, sizeof(GeisInputDeviceId));
+  grip_devices_for_type(device_type, devices, &priv->devices);
+  if (devices->len == 0) {
+      g_array_free(devices, TRUE);
+      return;
+  }
+
+  g_ptr_array_add (reg->gesture_list,
+                   (gchar *)grip_type_to_geis_type (gesture_type, touch_points));
+  g_ptr_array_add (reg->gesture_list,
+                   NULL);
+
 
   geis_subscribe (reg->instance,
-		  GEIS_ALL_INPUT_DEVICES,
-		  (const char**)reg->gesture_list->pdata,
-		  &gesture_funcs,
-		  reg);
+                  (GeisInputDeviceId *)devices->data,
+                  (const char**)reg->gesture_list->pdata,
+                  &gesture_funcs,
+                  reg);
+
+  g_array_unref (devices);
 
   /* XXX - check for duplicates in reg->bindings first */
   binding = g_new0 (GripGestureBinding, 1);
@@ -1035,9 +981,69 @@
 
   reg->bindings = g_list_append (reg->bindings, binding);
 
-  g_hash_table_insert (priv->hash,
+}
+
+static void
+register_internal (GripGestureManager *manager,
+                   GtkWidget          *widget,
+                   GripGestureType     gesture_type,
+                   GripDeviceType      device_type,
+                   gint                touch_points,
+                   GripGestureCallback callback,
+                   gpointer            user_data,
+                   GDestroyNotify      destroy)
+{
+  GripGestureManagerPrivate *priv;
+  GtkWidget *toplevel;
+  struct Registrations *registrations;
+
+  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  toplevel = gtk_widget_get_toplevel (widget);
+
+  g_return_if_fail (GTK_IS_WINDOW (toplevel));
+
+  priv = manager->priv;
+
+  if (!(registrations = g_hash_table_lookup (priv->registered_windows, toplevel)))
+    {
+      registrations = g_new(struct Registrations, 1);
+      registrations->touchscreen = new_window_registration(manager, toplevel);
+      registrations->touchpad = new_window_registration(manager, toplevel);
+      registrations->independent = new_window_registration(manager, toplevel);
+
+      if (registrations->touchscreen == NULL ||
+          registrations->touchpad == NULL ||
+          registrations->independent == NULL)
+        return;
+    }
+  else
+    {
+      geis_unsubscribe (registrations->touchscreen->instance,
+          (GeisGestureType*)registrations->touchscreen->gesture_list->pdata);
+      geis_unsubscribe (registrations->touchpad->instance,
+          (GeisGestureType*)registrations->touchpad->gesture_list->pdata);
+      geis_unsubscribe (registrations->independent->instance,
+          (GeisGestureType*)registrations->independent->gesture_list->pdata);
+    }
+
+  if (device_type & GRIP_DEVICE_TOUCHSCREEN)
+    bind_registration(manager,
+        registrations->touchscreen, widget, gesture_type, GRIP_DEVICE_TOUCHSCREEN, touch_points,
+        callback, user_data, destroy);
+
+  if (device_type & GRIP_DEVICE_TOUCHPAD)
+    bind_registration(manager,
+        registrations->touchpad, widget, gesture_type, GRIP_DEVICE_TOUCHPAD, touch_points,
+        callback, user_data, destroy);
+  if (device_type & GRIP_DEVICE_INDEPENDENT)
+    bind_registration(manager,
+        registrations->independent, widget, gesture_type, GRIP_DEVICE_INDEPENDENT, touch_points,
+        callback, user_data, destroy);
+  g_hash_table_insert (priv->registered_windows,
                        toplevel,
-                       reg);
+                       registrations);
 }
 
 static void
@@ -1061,6 +1067,7 @@
               register_internal (req->manager,
                                  req->widget,
                                  req->gesture_type,
+                                 req->device_type,
                                  req->touch_points,
                                  req->callback,
                                  req->user_data,
@@ -1094,6 +1101,7 @@
 register_widget (GripGestureManager *manager,
                  GtkWidget          *widget,
                  GripGestureType     gesture_type,
+                 GripDeviceType      device_type,
                  gint                touch_points,
                  GripGestureCallback callback,
                  gpointer            user_data,
@@ -1106,6 +1114,7 @@
       register_internal (manager,
                          widget,
                          gesture_type,
+                         device_type,
                          touch_points,
                          callback,
                          user_data,
@@ -1118,6 +1127,7 @@
       req->manager      = manager;
       req->widget       = widget;
       req->gesture_type = gesture_type;
+      req->device_type  = device_type;
       req->touch_points = touch_points;
       req->callback     = callback;
       req->user_data    = user_data;
@@ -1146,6 +1156,7 @@
       register_widget (req->manager,
                        req->widget,
                        req->gesture_type,
+                       req->device_type,
                        req->touch_points,
                        req->callback,
                        req->user_data,
@@ -1181,6 +1192,7 @@
 grip_gesture_manager_register_window (GripGestureManager  *manager,
                                       GtkWidget           *widget,
                                       GripGestureType      gesture_type,
+                                      GripDeviceType       device_type,
                                       gint                 touch_points,
                                       GripGestureCallback  callback,
                                       gpointer             user_data,
@@ -1200,6 +1212,7 @@
           register_internal (manager,
                              widget,
                              gesture_type,
+                             device_type,
                              touch_points,
                              callback,
                              user_data,
@@ -1213,6 +1226,7 @@
           req->manager      = manager;
           req->widget       = widget;
           req->gesture_type = gesture_type;
+          req->device_type  = device_type;
           req->touch_points = touch_points;
           req->callback     = callback;
           req->user_data    = user_data;
@@ -1233,6 +1247,7 @@
       req->manager      = manager;
       req->widget       = widget;
       req->gesture_type = gesture_type;
+      req->device_type  = device_type;
       req->touch_points = touch_points;
       req->callback     = callback;
       req->user_data    = user_data;
@@ -1245,6 +1260,40 @@
     }
 }
 
+static void
+shutdown_registration(GripGestureRegistration *reg)
+{
+  free_registration(reg);
+  geis_finish(reg->instance);
+  reg->instance = NULL;
+  g_free(reg);
+}
+
+void
+grip_gesture_manager_unregister_window (GripGestureManager  *manager,
+                                        GtkWidget           *toplevel)
+{
+  GripGestureManagerPrivate *priv = manager->priv;
+  struct Registrations *registrations;
+
+  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
+  g_return_if_fail (GTK_IS_WINDOW (toplevel));
+
+  /* Currently only allow unsubscribing after the window has been shown. */
+  g_return_if_fail (gtk_widget_get_mapped (GTK_WIDGET (toplevel)));
+  registrations = g_hash_table_lookup (priv->registered_windows, toplevel);
+  if (!registrations) {
+      return;
+  }
+
+  shutdown_registration(registrations->touchscreen);
+  shutdown_registration(registrations->touchpad);
+  shutdown_registration(registrations->independent);
+  g_free(registrations);
+  g_hash_table_remove(priv->registered_windows, toplevel);
+
+}
+
 GType
 grip_gesture_event_get_type (void)
 {

=== modified file 'src/gripgesturemanager.h'
--- src/gripgesturemanager.h	2011-03-23 15:17:02 +0000
+++ src/gripgesturemanager.h	2011-07-11 12:13:41 +0000
@@ -23,8 +23,8 @@
  *    Cody Russell <[e-mail]>
  */
 
-#ifndef __GRIP_GESTURE_MANAGER_H__
-#define __GRIP_GESTURE_MANAGER_H__
+#ifndef GRIP_GESTURE_MANAGER_H
+#define GRIP_GESTURE_MANAGER_H
 
 #include <gtk/gtk.h>
 
@@ -56,6 +56,14 @@
 } GripGestureType;
 
 typedef enum {
+  GRIP_DEVICE_TOUCHSCREEN = 1,
+  GRIP_DEVICE_TOUCHPAD    = 2,
+  GRIP_DEVICE_INDEPENDENT = 4,
+} GripDeviceType;
+
+#define GRIP_DEVICE_ALL (GRIP_DEVICE_TOUCHSCREEN | GRIP_DEVICE_TOUCHPAD | GRIP_DEVICE_INDEPENDENT)
+
+typedef enum {
   GRIP_TIME_START,
   GRIP_TIME_UPDATE,
   GRIP_TIME_END
@@ -201,6 +209,7 @@
  * @manager: self
  * @widget: A #GtkWidget on which to register the gesture
  * @gesture_type: Gesture type
+ * @device_type: Type of the device producing the gesture.
  * @touch_points: Number of touch points
  * @callback: Callback
  * @user_data: (transfer none): User data
@@ -209,11 +218,15 @@
 void                 grip_gesture_manager_register_window (GripGestureManager *manager,
                                                            GtkWidget          *widget,
                                                            GripGestureType     gesture_type,
+                                                           GripDeviceType      device_type,
                                                            gint                touch_points,
                                                            GripGestureCallback callback,
                                                            gpointer            user_data,
                                                            GDestroyNotify      destroy);
 
+void grip_gesture_manager_unregister_window (GripGestureManager  *manager,
+                                             GtkWidget           *widget);
+
 GType             grip_gesture_event_get_type (void) G_GNUC_CONST;
 GripGestureEvent *grip_gesture_event_new      (GripGestureType   gesture_type);
 void              grip_gesture_event_free     (GripGestureEvent *event);
@@ -222,4 +235,4 @@
 
 G_END_DECLS
 
-#endif /* __GRIP_GESTURE_MANAGER_H__ */
+#endif /* GRIP_GESTURE_MANAGER_H */

=== modified file 'src/griptypebuiltins.c'
--- src/griptypebuiltins.c	2011-03-04 19:15:32 +0000
+++ src/griptypebuiltins.c	2011-07-11 12:13:41 +0000
@@ -21,6 +21,21 @@
   return enum_type_id;
 }
 GType
+grip_device_type_get_type(void) {
+  static GType enum_type_id = 0;
+  if (G_UNLIKELY (!enum_type_id))
+    {
+      static const GEnumValue values[] = {
+        { GRIP_DEVICE_TOUCHSCREEN, "GRIP_DEVICE_TOUCHSCREEN", "touchscreen" },
+        { GRIP_DEVICE_TOUCHPAD, "GRIP_DEVICE_TOUCHPAD", "touchpad" },
+        { GRIP_DEVICE_INDEPENDENT, "GRIP_DEVICE_INDEPENDENT", "independent" },
+        { 0, NULL, NULL }
+      };
+      enum_type_id = g_enum_register_static (g_intern_static_string ("GripDeviceType"), values);
+    }
+  return enum_type_id;
+}
+GType
 grip_time_type_get_type(void) {
   static GType enum_type_id = 0;
   if (G_UNLIKELY (!enum_type_id))

=== modified file 'src/griptypebuiltins.h.in'
--- src/griptypebuiltins.h.in	2010-11-22 14:49:44 +0000
+++ src/griptypebuiltins.h.in	2011-07-11 12:13:41 +0000
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef __GRIP_ENUM_TYPES_H__
-#define __GRIP_ENUM_TYPES_H__
+#ifndef GRIP_ENUM_TYPES_H
+#define GRIP_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -15,7 +15,7 @@
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* !__GRIP_ENUM_TYPES_H__ */
+#endif /* !GRIP_ENUM_TYPES_H */
 /*** END file-tail ***/
 
 /*** BEGIN value-header ***/

=== renamed file 'src/libgrip-0.1.ver' => 'src/libgrip.ver'
--- src/libgrip-0.1.ver	2011-03-04 21:48:13 +0000
+++ src/libgrip.ver	2011-07-11 12:13:41 +0000
@@ -37,3 +37,7 @@
     *;
 };
 
+GRIP_0.2 {
+  global:
+    grip_gesture_manager_unregister_window;
+} GRIP_0.1;