Merge lp:~bratsche/libgrip/rename-to-libgrip into lp:libgrip

[Cody Russell]

[Duncan McGreggor (oubiwann)]

1) Can you also rename the pygrope example to pygrip? The files under the pygrope directory will also need to be renamed.

Other than that, looks great -- nice quick response, man :-)

review: Needs Fixing

[lp:~bratsche/libgrip/rename-to-libgrip]

12. By Cody Russell on 2010-11-22

Move pygrope to pygrip

13. By Cody Russell on 2010-11-22

Rename pygrope files

[Duncan McGreggor (oubiwann)]

Thanks for the fix push, Cody! Looks great. +1 for merge.

review: Approve

=== modified file 'INSTALL'
--- INSTALL	2010-10-12 15:42:04 +0000
+++ INSTALL	2010-11-22 15:13:53 +0000
@@ -1,16 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +32,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,45 +83,69 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -116,16 +156,47 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +208,53 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +281,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +292,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +301,29 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +350,16 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 

=== modified file 'Makefile.am'
--- Makefile.am	2010-11-17 18:25:47 +0000
+++ Makefile.am	2010-11-22 15:13:53 +0000
@@ -6,15 +6,15 @@
 
 SUBDIRS = build src examples/rectangle-mover
 
-libgrope-0.1.pc: libgrope.pc
-	$(QUIET_GEN) cp -f libgrope.pc libgrope-0.1.pc
+libgrip-0.1.pc: libgrip.pc
+	$(QUIET_GEN) cp -f libgrip.pc libgrip-0.1.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgrope-0.1.pc
+pkgconfig_DATA = libgrip-0.1.pc
 
-CLEANFILES = libgrope-0.1.pc
-DISTCLEANFILES = libgrope.pc grope*.tar.gz
-EXTRA_DIST = libgrope.pc.in m4/introspection.m4
+CLEANFILES = libgrip-0.1.pc
+DISTCLEANFILES = libgrip.pc grip*.tar.gz
+EXTRA_DIST = libgrip.pc.in m4/introspection.m4
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc
 

=== modified file 'autogen.sh'
--- autogen.sh	2010-10-12 15:42:04 +0000
+++ autogen.sh	2010-11-22 15:13:53 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PKG_NAME="grope"
+PKG_NAME="grip"
 
 which gnome-autogen.sh || {
     echo "You need gnome-common from GNOME git"

=== modified file 'configure.ac'
--- configure.ac	2010-11-17 18:25:47 +0000
+++ configure.ac	2010-11-22 15:13:53 +0000
@@ -1,25 +1,25 @@
 #
 # shamelessly stolen from clutter-gtk
 #
-m4_define([grope_major_version], [0])
-m4_define([grope_minor_version], [1])
-m4_define([grope_micro_version], [0])
-
-m4_define([grope_api_version],
-          [grope_major_version.grope_minor_version])
-m4_define([grope_version],
-          [grope_major_version.grope_minor_version.grope_micro_version])
-
-m4_define([grope_interface_age], [0])
-m4_define([grope_binary_age],
-          [m4_eval(100 * grope_minor_version + grope_micro_version)])
+m4_define([grip_major_version], [0])
+m4_define([grip_minor_version], [1])
+m4_define([grip_micro_version], [0])
+
+m4_define([grip_api_version],
+          [grip_major_version.grip_minor_version])
+m4_define([grip_version],
+          [grip_major_version.grip_minor_version.grip_micro_version])
+
+m4_define([grip_interface_age], [0])
+m4_define([grip_binary_age],
+          [m4_eval(100 * grip_minor_version + grip_micro_version)])
 
 AC_PREREQ(2.59)
 
-AC_INIT([grope],
-        [grope_version],
-        [https://bugs.launchpad.net/libgrope])
-AC_CONFIG_SRCDIR([src/grope.h])
+AC_INIT([grip],
+        [grip_version],
+        [https://bugs.launchpad.net/libgrip])
+AC_CONFIG_SRCDIR([src/grip.h])
 AC_CONFIG_MACRO_DIR([build/autotools])
 
 AM_CONFIG_HEADER([config.h])
@@ -27,27 +27,27 @@
 AM_INIT_AUTOMAKE([1.9])
 AM_MAINTAINER_MODE
 
-GROPE_MAJOR_VERSION=grope_major_version
-GROPE_MINOR_VERSION=grope_minor_version
-GROPE_MICRO_VERSION=grope_micro_version
-GROPE_VERSION=grope_version
-AC_SUBST(GROPE_MAJOR_VERSION)
-AC_SUBST(GROPE_MINOR_VERSION)
-AC_SUBST(GROPE_MICRO_VERSION)
-AC_SUBST(GROPE_VERSION)
+GRIP_MAJOR_VERSION=grip_major_version
+GRIP_MINOR_VERSION=grip_minor_version
+GRIP_MICRO_VERSION=grip_micro_version
+GRIP_VERSION=grip_version
+AC_SUBST(GRIP_MAJOR_VERSION)
+AC_SUBST(GRIP_MINOR_VERSION)
+AC_SUBST(GRIP_MICRO_VERSION)
+AC_SUBST(GRIP_VERSION)
 
 m4_define([lt_current],
-          [m4_eval(100 * grope_minor_version + grope_micro_version - grope_interface_age)])
-m4_define([lt_revision], [grope_interface_age])
-m4_define([lt_age], [m4_eval(grope_binary_age - grope_interface_age)])
-GROPE_LT_CURRENT=lt_current
-GROPE_LT_REV=lt_revision
-GROPE_LT_AGE=lt_age
-GROPE_LT_VERSION="$GROPE_LT_CURRENT:$GROPE_LT_REV:$GROPE_LT_AGE"
-GROPE_LT_LDFLAGS="-version-info $GROPE_LT_VERSION"
+          [m4_eval(100 * grip_minor_version + grip_micro_version - grip_interface_age)])
+m4_define([lt_revision], [grip_interface_age])
+m4_define([lt_age], [m4_eval(grip_binary_age - grip_interface_age)])
+GRIP_LT_CURRENT=lt_current
+GRIP_LT_REV=lt_revision
+GRIP_LT_AGE=lt_age
+GRIP_LT_VERSION="$GRIP_LT_CURRENT:$GRIP_LT_REV:$GRIP_LT_AGE"
+GRIP_LT_LDFLAGS="-version-info $GRIP_LT_VERSION"
 
-AC_SUBST(GROPE_LT_VERSION)
-AC_SUBST(GROPE_LT_LDFLAGS)
+AC_SUBST(GRIP_LT_VERSION)
+AC_SUBST(GRIP_LT_LDFLAGS)
 
 dnl ===========================================================================
 
@@ -87,7 +87,7 @@
 AC_SUBST(GCC_FLAGS)
 
 # use strict compiler flags only on development releases
-m4_define([maintainer_flags_default], [m4_if(m4_eval(grope_minor_version % 2), [1], [yes], [no])])
+m4_define([maintainer_flags_default], [m4_if(m4_eval(grip_minor_version % 2), [1], [yes], [no])])
 AC_ARG_ENABLE([maintainer-flags],
               [AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
                               [Use strict compiler flags @<:@default=no@:>@])],
@@ -120,13 +120,13 @@
   build/autotools/shave
   src/Makefile
   examples/rectangle-mover/Makefile
-  libgrope.pc
+  libgrip.pc
 ])
 
 AC_OUTPUT
 
 echo ""
-echo " grope $VERSION"
+echo " grip $VERSION"
 echo " ==============================="
 echo ""
 echo " Prefix       : ${prefix}"

=== renamed directory 'examples/pygrope' => 'examples/pygrip'
=== renamed file 'examples/pygrope/pygrope-gestures.xml' => 'examples/pygrip/pygrip-gestures.xml'
=== renamed file 'examples/pygrope/pygrope.py' => 'examples/pygrip/pygrip.py'
--- examples/pygrope/pygrope.py	2010-11-17 18:09:57 +0000
+++ examples/pygrip/pygrip.py	2010-11-22 15:13:53 +0000
@@ -1,11 +1,11 @@
 import pygtk
 from gi.repository import Gtk
-from gi.repository import Grope
-
-
-# XXX For now, we'll use Grope directly. Once we have a good sense of what's
-# going to be needed in general for general Python code using Grope, we might
-# want to put that stuff in a wrapper grope module, and import everything from
+from gi.repository import Grip
+
+
+# XXX For now, we'll use Grip directly. Once we have a good sense of what's
+# going to be needed in general for general Python code using Grip, we might
+# want to put that stuff in a wrapper grip module, and import everything from
 # there instead.
 
 
@@ -13,18 +13,18 @@
 
     def __init__(self):
         builder = Gtk.Builder()
-        builder.add_from_file("pygrope-gestures.xml")
+        builder.add_from_file("pygrip-gestures.xml")
         builder.connect_signals(self)
         self.window = builder.get_object("window1")
         self.window.show()
 
     def window_mapped(self, widget, data=None):
         # The gesture manager is only going to be needed for GTK2, since GTK3
-        # will have the gesture API natively. Conversely, pygrope will only be
+        # will have the gesture API natively. Conversely, pygrip will only be
         # for GTK2, since PyGTK3 will having the bindings.
-        gesture_manager = Grope.GestureManager()
+        gesture_manager = Grip.GestureManager()
         # For the purpose of this example, we are registering all gestures; we
-        # could limit this by choosing a different pygrope.GROPE_GESTURE_*
+        # could limit this by choosing a different pygrip.GRIP_GESTURE_*
         # mask. Similarly, we're using one set of callbacks for all the
         # gestures; we could have different callbacks for different registered
         # gestures.
@@ -32,7 +32,7 @@
         # reverted to the older API until the new one is merged to trunk.
         finger_count = 2
         gesture_manager.register_window(
-            self.window, Grope.GestureType.PINCH, finger_count,self.callback,
+            self.window, Grip.GestureType.PINCH, finger_count,self.callback,
             None, None)
 
     def callback(self, window, time_type, gesture_type, gesture_event):

=== modified file 'examples/rectangle-mover/Makefile.am'
--- examples/rectangle-mover/Makefile.am	2010-11-05 18:42:35 +0000
+++ examples/rectangle-mover/Makefile.am	2010-11-22 15:13:53 +0000
@@ -12,4 +12,4 @@
 	$(GTK_CFLAGS)		\
 	$(MAINTAINER_CFLAGS)
 
-gesture_LDADD = $(top_builddir)/src/libgrope-0.1.la
+gesture_LDADD = $(top_builddir)/src/libgrip-0.1.la

=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2010-11-18 21:40:02 +0000
+++ examples/rectangle-mover/gesture.c	2010-11-22 15:13:53 +0000
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <signal.h>
 
-#include "gropegesturemanager.h"
+#include "gripgesturemanager.h"
 
 static gint    rotate = 0;
 static gdouble scale = 1.0;
@@ -62,15 +62,15 @@
 
 static void
 gesture_callback (GtkWindow         *window,
-                  GropeTimeType      time_type,
-                  GropeGestureEvent *event,
+                  GripTimeType      time_type,
+                  GripGestureEvent *event,
                   gpointer           user_data)
 {
-  if (time_type == GROPE_TIME_START)
+  if (time_type == GRIP_TIME_START)
     {
       in_touch++;
     }
-  else if (time_type == GROPE_TIME_END)
+  else if (time_type == GRIP_TIME_END)
     {
       in_touch--;
     }
@@ -78,32 +78,32 @@
     {
       switch (event->type)
         {
-        case GROPE_GESTURE_DRAG:
+        case GRIP_GESTURE_DRAG:
           {
-            GropeEventGestureDrag *e = (GropeEventGestureDrag *)event;
+            GripEventGestureDrag *e = (GripEventGestureDrag *)event;
 
             translate[0] += e->delta_x;
             translate[1] += e->delta_y;
           }
           break;
 
-        case GROPE_GESTURE_PINCH:
+        case GRIP_GESTURE_PINCH:
           {
-            GropeEventGesturePinch *e = (GropeEventGesturePinch *)event;
+            GripEventGesturePinch *e = (GripEventGesturePinch *)event;
 
             scale += e->radius_delta / 100;
           }
           break;
 
-        case GROPE_GESTURE_ROTATE:
+        case GRIP_GESTURE_ROTATE:
           {
-            GropeEventGestureRotate *e = (GropeEventGestureRotate *)event;
+            GripEventGestureRotate *e = (GripEventGestureRotate *)event;
 
             rotate += e->angle_delta * 100;
           }
           break;
 
-	case GROPE_GESTURE_TAP:
+	case GRIP_GESTURE_TAP:
 	  break;
         }
     }
@@ -114,33 +114,33 @@
 static void
 window_mapped (GtkWidget *widget)
 {
-  GropeGestureManager *manager = grope_gesture_manager_get ();
+  GripGestureManager *manager = grip_gesture_manager_get ();
   GtkWindow *window = GTK_WINDOW (widget);
 
-  grope_gesture_manager_register_window (manager,
-					 window,
-					 GROPE_GESTURE_PINCH,
-					 2,
-					 gesture_callback,
-                                         NULL, NULL);
-
-  grope_gesture_manager_register_window (manager,
-					 window,
-					 GROPE_GESTURE_ROTATE,
-					 2,
-					 gesture_callback,
-                                         NULL, NULL);
-
-  grope_gesture_manager_register_window (manager,
-					 window,
-					 GROPE_GESTURE_DRAG,
-					 2,
-					 gesture_callback,
-                                         NULL, NULL);
-
-  grope_gesture_manager_register_window (manager,
-					 window,
-					 GROPE_GESTURE_TAP,
+  grip_gesture_manager_register_window (manager,
+					 window,
+					 GRIP_GESTURE_PINCH,
+					 2,
+					 gesture_callback,
+                                         NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+					 window,
+					 GRIP_GESTURE_ROTATE,
+					 2,
+					 gesture_callback,
+                                         NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+					 window,
+					 GRIP_GESTURE_DRAG,
+					 2,
+					 gesture_callback,
+                                         NULL, NULL);
+
+  grip_gesture_manager_register_window (manager,
+					 window,
+					 GRIP_GESTURE_TAP,
 					 2,
 					 gesture_callback,
 					 NULL, NULL);

=== renamed file 'libgrope.pc.in' => 'libgrip.pc.in'
--- libgrope.pc.in	2010-10-12 15:42:04 +0000
+++ libgrip.pc.in	2010-11-22 15:13:53 +0000
@@ -3,9 +3,9 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libgrope
+Name: libgrip
 Description: Multitouch gesture library
 Version: @VERSION@
-Libs: -L${libdir} -lgrope-0.1
-Cflags: -I${includedir}/libgrope-0.1
+Libs: -L${libdir} -lgrip-0.1
+Cflags: -I${includedir}/libgrip-0.1
 Requires: gtk+-2.0

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-11-10 20:01:11 +0000
+++ src/Makefile.am	2010-11-22 15:13:53 +0000
@@ -1,29 +1,29 @@
-grope_built_public_sources =		\
-	gropetypebuiltins.h
+grip_built_public_sources =		\
+	griptypebuiltins.h
 
 stamp_files =				\
-	gropetypebuiltins.h		\
-	gropetypebuiltins.c
+	griptypebuiltins.h		\
+	griptypebuiltins.c
 
 sources_h =				\
-	gropegesturemanager.h
+	gripgesturemanager.h
 
 EXTRA_DIST =				\
-	gropetypebuiltins.h.in		\
-	gropetypebuiltins.c.in
-
-gropetypebuiltins.h: stamp-gropetypebuiltins.h
-
-stamp-gropetypebuiltins.h: $(sources_h)
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template gropetypebuiltins.h.in			\
+	griptypebuiltins.h.in		\
+	griptypebuiltins.c.in
+
+griptypebuiltins.h: stamp-griptypebuiltins.h
+
+stamp-griptypebuiltins.h: $(sources_h)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template griptypebuiltins.h.in			\
 	  $(sources_h) ) >> xgen-gtbh								\
-	  && (cmp -s xgen-gtbh gropetypebuiltins.h || cp xgen-gtbh gropetypebuiltins.h )	\
+	  && (cmp -s xgen-gtbh griptypebuiltins.h || cp xgen-gtbh griptypebuiltins.h )	\
 	  && rm -f xgen-gtbh && echo timestamp > $(@F)
 
-gropetypebuiltins.c: stamp-gropetypebuiltins.h
-	( cd $(srcdir) && $(GLIB_MKENUMS) --template gropetypebuiltins.c.in			\
+griptypebuiltins.c: stamp-griptypebuiltins.h
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template griptypebuiltins.c.in			\
 	  $(sources_h) ) > xgen-gtbc								\
-	&& cp xgen-gtbc gropetypebuiltins.c && rm -f xgen-gtbc
+	&& cp xgen-gtbc griptypebuiltins.c && rm -f xgen-gtbc
 
 CLEANFILES =
 
@@ -34,19 +34,19 @@
 introspection_sources = $(patsubst %,$(srcdir)/%,$(sources_h))
 
 irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
-Grope-0.1.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
+Grip-0.1.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
 	$(INTROSPECTION_SCANNER)						\
-		-v --namespace Grope						\
+		-v --namespace Grip						\
 		--nsversion=0.1							\
 		--add-include-path=$(srcdir) $(GTK_CFLAGS)			\
 		--include=GObject-2.0						\
 		--include=GLib-2.0						\
 		--include=Gtk-2.0						\
-		--library=grope-0.1						\
-		--output Grope-0.1.gir $(irscanner_headers)			\
-		$(addprefix --c-include=src/, $(grope_headers))
+		--library=grip-0.1						\
+		--output Grip-0.1.gir $(irscanner_headers)			\
+		$(addprefix --c-include=src/, $(grip_headers))
 
-BUILT_GIRSOURCES += Grope-0.1.gir
+BUILT_GIRSOURCES += Grip-0.1.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)
@@ -70,7 +70,7 @@
 INCLUDES =				\
 	-I$(srcdir)			\
 	-I$(top_srcdir)			\
-	-DG_LOG_DOMAIN=\"GROPE\"	\
+	-DG_LOG_DOMAIN=\"GRIP\"	\
 	-DPREFIX=\"$(prefix)"\"		\
 	-DLIBDIR=\"$(libdir)"\"		\
 	-DG_DISABLE_DEPRECATED		\
@@ -84,24 +84,24 @@
 	$(GEIS_CFLAGS)			\
 	$(MAINTAINER_CFLAGS)
 
-lib_LTLIBRARIES = libgrope-0.1.la
-
-libgrope_0_1_la_SOURCES =		\
-	gropegesturemanager.c		\
-	gropetypebuiltins.c
-
-libgropeincludedir=$(includedir)/libgrope-0.1/libgrope
-
-libgropeinclude_HEADERS =		\
-	gropegesturemanager.h		\
-	grope.h
-
-libgrope_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
-libgrope_0_1_la_LDFLAGS = $(GTK_LT_LDFLAGS)
-
-gropeheadersdir = $(includedir)/grope-0.1/grope
+lib_LTLIBRARIES = libgrip-0.1.la
+
+libgrip_0_1_la_SOURCES =		\
+	gripgesturemanager.c		\
+	griptypebuiltins.c
+
+libgripincludedir=$(includedir)/libgrip-0.1/libgrip
+
+libgripinclude_HEADERS =		\
+	gripgesturemanager.h		\
+	grip.h
+
+libgrip_0_1_la_LIBADD = $(GTK_LIBS) $(GEIS_LIBS)
+libgrip_0_1_la_LDFLAGS = $(GTK_LT_LDFLAGS)
+
+gripheadersdir = $(includedir)/grip-0.1/grip
 
 DISTCLEANFILES =			\
-	stamp-gropetypebuiltins.h	\
-	gropetypebuiltins.h		\
-	gropetypebuiltins.c
\ No newline at end of file
+	stamp-griptypebuiltins.h	\
+	griptypebuiltins.h		\
+	griptypebuiltins.c
\ No newline at end of file

=== renamed file 'src/grope.h' => 'src/grip.h'
--- src/grope.h	2010-11-09 21:00:30 +0000
+++ src/grip.h	2010-11-22 15:13:53 +0000
@@ -23,9 +23,9 @@
  *    Cody Russell <[e-mail]>
  */
 
-#ifndef __GROPE_H__
-#define __GROPE_H__
-
-#include <libgrope/gropegesturemanager.h>
-
-#endif /* __GROPE_H__ */
+#ifndef __GRIP_H__
+#define __GRIP_H__
+
+#include <libgrip/gripgesturemanager.h>
+
+#endif /* __GRIP_H__ */

=== renamed file 'src/gropegesturemanager.c' => 'src/gripgesturemanager.c'
--- src/gropegesturemanager.c	2010-11-19 00:18:08 +0000
+++ src/gripgesturemanager.c	2010-11-22 15:13:53 +0000
@@ -23,29 +23,29 @@
  *    Cody Russell <[e-mail]>
  */
 
-#include "gropegesturemanager.h"
+#include "gripgesturemanager.h"
 
 #include <gdk/gdkx.h>
 #include <geis/geis.h>
 
-typedef struct _GropeGestureRegistration GropeGestureRegistration;
-typedef struct _GropeGestureBinding      GropeGestureBinding;
+typedef struct _GripGestureRegistration GripGestureRegistration;
+typedef struct _GripGestureBinding      GripGestureBinding;
 
-struct _GropeGestureManagerPrivate
+struct _GripGestureManagerPrivate
 {
   GHashTable *hash;
 };
 
-struct _GropeGestureBinding
+struct _GripGestureBinding
 {
-  GropeGestureType      type;
-  gint                  touches;
-  GropeGestureCallback  callback;
-  gpointer              data;
-  GDestroyNotify        destroy;
+  GripGestureType      type;
+  gint                 touches;
+  GripGestureCallback  callback;
+  gpointer             data;
+  GDestroyNotify       destroy;
 };
 
-struct _GropeGestureRegistration
+struct _GripGestureRegistration
 {
   GtkWindow         *window;
   GList             *bindings;
@@ -83,7 +83,7 @@
                             GeisSize           attr_count,
                             GeisGestureAttr   *attrs);
 
-static GropeGestureManager *manager_singleton = NULL;
+static GripGestureManager *manager_singleton = NULL;
 static GeisGestureFuncs gesture_funcs = {
   gesture_added,
   gesture_removed,
@@ -92,14 +92,14 @@
   gesture_finish
 };
 
-G_DEFINE_TYPE (GropeGestureManager, grope_gesture_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GripGestureManager, grip_gesture_manager, G_TYPE_OBJECT)
 
-#define GROPE_GESTURE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GROPE_TYPE_GESTURE_MANAGER, GropeGestureManagerPrivate))
+#define GRIP_GESTURE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRIP_TYPE_GESTURE_MANAGER, GripGestureManagerPrivate))
 
 static void
-grope_gesture_manager_dispose (GObject *object)
+grip_gesture_manager_dispose (GObject *object)
 {
-  GropeGestureManagerPrivate *priv = GROPE_GESTURE_MANAGER (object)->priv;
+  GripGestureManagerPrivate *priv = GRIP_GESTURE_MANAGER (object)->priv;
 
   if (priv->hash != NULL)
     {
@@ -109,14 +109,14 @@
 }
 
 static void
-grope_gesture_manager_finalize (GObject *object)
+grip_gesture_manager_finalize (GObject *object)
 {
 }
 
 static GObject *
-grope_gesture_manager_constructor (GType                  type,
-				   guint                  n_params,
-				   GObjectConstructParam *params)
+grip_gesture_manager_constructor (GType                  type,
+                                  guint                  n_params,
+                                  GObjectConstructParam *params)
 {
   GObject *object;
 
@@ -126,11 +126,11 @@
     }
   else
     {
-      object = G_OBJECT_CLASS (grope_gesture_manager_parent_class)->constructor (type,
-										 n_params,
-										 params);
+      object = G_OBJECT_CLASS (grip_gesture_manager_parent_class)->constructor (type,
+                                                                                n_params,
+                                                                                params);
 
-      manager_singleton = GROPE_GESTURE_MANAGER (object);
+      manager_singleton = GRIP_GESTURE_MANAGER (object);
       g_object_add_weak_pointer (object, (gpointer) &manager_singleton);
     }
 
@@ -138,25 +138,25 @@
 }
 
 static void
-grope_gesture_manager_class_init (GropeGestureManagerClass *class)
+grip_gesture_manager_class_init (GripGestureManagerClass *class)
 {
   GObjectClass     *gobject_class;
 
   gobject_class = G_OBJECT_CLASS (class);
 
-  grope_gesture_manager_parent_class = g_type_class_peek_parent (class);
-
-  g_type_class_add_private (gobject_class, sizeof (GropeGestureManagerPrivate));
-
-  gobject_class->constructor = grope_gesture_manager_constructor;
-  gobject_class->dispose     = grope_gesture_manager_dispose;
-  gobject_class->finalize    = grope_gesture_manager_finalize;
+  grip_gesture_manager_parent_class = g_type_class_peek_parent (class);
+
+  g_type_class_add_private (gobject_class, sizeof (GripGestureManagerPrivate));
+
+  gobject_class->constructor = grip_gesture_manager_constructor;
+  gobject_class->dispose     = grip_gesture_manager_dispose;
+  gobject_class->finalize    = grip_gesture_manager_finalize;
 }
 
 static gint
-pinch_gesture_handle_properties (GropeEventGesturePinch *event,
-                                 GeisSize                attr_count,
-                                 GeisGestureAttr        *attrs)
+pinch_gesture_handle_properties (GripEventGesturePinch *event,
+                                 GeisSize               attr_count,
+                                 GeisGestureAttr       *attrs)
 {
   gint i = 0;
   gint touches = 0;
@@ -204,9 +204,9 @@
 }
 
 static gint
-drag_gesture_handle_properties (GropeEventGestureDrag *event,
-                                GeisSize               attr_count,
-                                GeisGestureAttr       *attrs)
+drag_gesture_handle_properties (GripEventGestureDrag *event,
+                                GeisSize              attr_count,
+                                GeisGestureAttr      *attrs)
 {
   gint i;
   gint touches = 0;
@@ -269,9 +269,9 @@
 }
 
 static gint
-rotate_gesture_handle_properties (GropeEventGestureRotate *event,
-                                  GeisSize                 attr_count,
-                                  GeisGestureAttr         *attrs)
+rotate_gesture_handle_properties (GripEventGestureRotate *event,
+                                  GeisSize                attr_count,
+                                  GeisGestureAttr        *attrs)
 {
   gint i;
   gint touches = 0;
@@ -319,9 +319,9 @@
 }
 
 static gint
-tap_gesture_handle_properties (GropeEventGestureTap *event,
-			       GeisSize              attr_count,
-			       GeisGestureAttr      *attrs)
+tap_gesture_handle_properties (GripEventGestureTap *event,
+			       GeisSize             attr_count,
+			       GeisGestureAttr     *attrs)
 {
   gint i;
   gint touches = 0;
@@ -383,18 +383,18 @@
                GeisSize           attr_count,
                GeisGestureAttr   *attrs)
 {
-  GropeGestureRegistration *reg = (GropeGestureRegistration *)cookie;
+  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
   GList *l = NULL;
 
   for (l = reg->bindings; l != NULL; l = l->next)
     {
-      GropeGestureBinding *binding = (GropeGestureBinding *)l->data;
+      GripGestureBinding *binding = (GripGestureBinding *)l->data;
 
       if (binding->type == type)
         {
-          if (type == GROPE_GESTURE_DRAG)
+          if (type == GRIP_GESTURE_DRAG)
             {
-              GropeEventGestureDrag drag;
+              GripEventGestureDrag drag;
 
               drag.type    = type;
               drag.id      = id;
@@ -405,14 +405,14 @@
               if (drag.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_START,
-                                     ((GropeGestureEvent*)&drag),
+                                     GRIP_TIME_START,
+                                     ((GripGestureEvent*)&drag),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_PINCH)
+          else if (type == GRIP_GESTURE_PINCH)
             {
-              GropeEventGesturePinch pinch;
+              GripEventGesturePinch pinch;
 
               pinch.type    = type;
               pinch.id      = id;
@@ -423,14 +423,14 @@
               if (pinch.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_START,
-                                     ((GropeGestureEvent*)&pinch),
+                                     GRIP_TIME_START,
+                                     ((GripGestureEvent*)&pinch),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_ROTATE)
+          else if (type == GRIP_GESTURE_ROTATE)
             {
-              GropeEventGestureRotate rotate;
+              GripEventGestureRotate rotate;
 
               rotate.type    = type;
               rotate.id      = id;
@@ -441,14 +441,14 @@
               if (rotate.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_START,
-                                     ((GropeGestureEvent*)&rotate),
+                                     GRIP_TIME_START,
+                                     ((GripGestureEvent*)&rotate),
                                      binding->data);
                 }
             }
-	  else if (type == GROPE_GESTURE_TAP)
+	  else if (type == GRIP_GESTURE_TAP)
 	    {
-	      GropeEventGestureTap tap;
+	      GripEventGestureTap tap;
 
 	      tap.type    = type;
 	      tap.id      = id;
@@ -459,8 +459,8 @@
 	      if (tap.fingers == binding->touches)
 		{
 		  binding->callback (reg->window,
-				     GROPE_TIME_START,
-				     ((GropeGestureEvent*)&tap),
+				     GRIP_TIME_START,
+				     ((GripGestureEvent*)&tap),
 				     binding->data);
 		}
 	    }
@@ -477,18 +477,18 @@
                 GeisSize           attr_count,
                 GeisGestureAttr   *attrs)
 {
-  GropeGestureRegistration *reg = (GropeGestureRegistration *)cookie;
+  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
   GList *l = NULL;
 
   for (l = reg->bindings; l != NULL; l = l->next)
     {
-      GropeGestureBinding *binding = (GropeGestureBinding *)l->data;
+      GripGestureBinding *binding = (GripGestureBinding *)l->data;
 
       if (binding->type == type)
         {
-          if (type == GROPE_GESTURE_DRAG)
+          if (type == GRIP_GESTURE_DRAG)
             {
-              GropeEventGestureDrag drag;
+              GripEventGestureDrag drag;
 
               drag.type    = type;
               drag.id      = id;
@@ -499,14 +499,14 @@
               if (drag.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_UPDATE,
-                                     ((GropeGestureEvent*)&drag),
+                                     GRIP_TIME_UPDATE,
+                                     ((GripGestureEvent*)&drag),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_PINCH)
+          else if (type == GRIP_GESTURE_PINCH)
             {
-              GropeEventGesturePinch pinch;
+              GripEventGesturePinch pinch;
 
               pinch.type    = type;
               pinch.id      = id;
@@ -517,14 +517,14 @@
               if (pinch.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_UPDATE,
-                                     ((GropeGestureEvent*)&pinch),
+                                     GRIP_TIME_UPDATE,
+                                     ((GripGestureEvent*)&pinch),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_ROTATE)
+          else if (type == GRIP_GESTURE_ROTATE)
             {
-              GropeEventGestureRotate rotate;
+              GripEventGestureRotate rotate;
 
               rotate.type    = type;
               rotate.id      = id;
@@ -535,14 +535,14 @@
               if (rotate.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_UPDATE,
-                                     ((GropeGestureEvent*)&rotate),
+                                     GRIP_TIME_UPDATE,
+                                     ((GripGestureEvent*)&rotate),
                                      binding->data);
                 }
             }
-	  else if (type == GROPE_GESTURE_TAP)
+	  else if (type == GRIP_GESTURE_TAP)
 	    {
-	      GropeEventGestureTap tap;
+	      GripEventGestureTap tap;
 
 	      tap.type    = type;
 	      tap.id      = id;
@@ -553,8 +553,8 @@
 	      if (tap.fingers == binding->touches)
 		{
 		  binding->callback (reg->window,
-				     GROPE_TIME_UPDATE,
-				     ((GropeGestureEvent*)&tap),
+				     GRIP_TIME_UPDATE,
+				     ((GripGestureEvent*)&tap),
 				     binding->data);
 		}
 	    }
@@ -569,18 +569,18 @@
                 GeisSize           attr_count,
                 GeisGestureAttr   *attrs)
 {
-  GropeGestureRegistration *reg = (GropeGestureRegistration *)cookie;
+  GripGestureRegistration *reg = (GripGestureRegistration *)cookie;
   GList *l = NULL;
 
   for (l = reg->bindings; l != NULL; l = l->next)
     {
-      GropeGestureBinding *binding = (GropeGestureBinding *)l->data;
+      GripGestureBinding *binding = (GripGestureBinding *)l->data;
 
       if (binding->type == type)
         {
-          if (type == GROPE_GESTURE_DRAG)
+          if (type == GRIP_GESTURE_DRAG)
             {
-              GropeEventGestureDrag drag;
+              GripEventGestureDrag drag;
 
               drag.type    = type;
               drag.id      = id;
@@ -591,14 +591,14 @@
               if (drag.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_END,
-                                     ((GropeGestureEvent*)&drag),
+                                     GRIP_TIME_END,
+                                     ((GripGestureEvent*)&drag),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_PINCH)
+          else if (type == GRIP_GESTURE_PINCH)
             {
-              GropeEventGesturePinch pinch;
+              GripEventGesturePinch pinch;
 
               pinch.type    = type;
               pinch.id      = id;
@@ -609,14 +609,14 @@
               if (pinch.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_END,
-                                     ((GropeGestureEvent*)&pinch),
+                                     GRIP_TIME_END,
+                                     ((GripGestureEvent*)&pinch),
                                      binding->data);
                 }
             }
-          else if (type == GROPE_GESTURE_ROTATE)
+          else if (type == GRIP_GESTURE_ROTATE)
             {
-              GropeEventGestureRotate rotate;
+              GripEventGestureRotate rotate;
 
               rotate.type    = type;
               rotate.id      = id;
@@ -627,14 +627,14 @@
               if (rotate.fingers == binding->touches)
                 {
                   binding->callback (reg->window,
-                                     GROPE_TIME_END,
-                                     ((GropeGestureEvent*)&rotate),
+                                     GRIP_TIME_END,
+                                     ((GripGestureEvent*)&rotate),
                                      binding->data);
                 }
             }
-	  else if (type == GROPE_GESTURE_TAP)
+	  else if (type == GRIP_GESTURE_TAP)
 	    {
-	      GropeEventGestureTap tap;
+	      GripEventGestureTap tap;
 
 	      tap.type    = type;
 	      tap.id      = id;
@@ -645,8 +645,8 @@
 	      if (tap.fingers == binding->touches)
 		{
 		  binding->callback (reg->window,
-				     GROPE_TIME_END,
-				     ((GropeGestureEvent*)&tap),
+				     GRIP_TIME_END,
+				     ((GripGestureEvent*)&tap),
 				     binding->data);
 		}
 	    }
@@ -655,11 +655,11 @@
 }
 
 static void
-grope_gesture_manager_init (GropeGestureManager *item)
+grip_gesture_manager_init (GripGestureManager *item)
 {
-  GropeGestureManagerPrivate *priv;
+  GripGestureManagerPrivate *priv;
 
-  priv = item->priv = GROPE_GESTURE_MANAGER_GET_PRIVATE (item);
+  priv = item->priv = GRIP_GESTURE_MANAGER_GET_PRIVATE (item);
 
   priv->hash = g_hash_table_new (g_direct_hash, g_direct_equal);
 }
@@ -669,7 +669,7 @@
              GIOCondition  condition,
              gpointer      data)
 {
-  GropeGestureRegistration *reg = (GropeGestureRegistration *)data;
+  GripGestureRegistration *reg = (GripGestureRegistration *)data;
 
   geis_event_dispatch (reg->instance);
 
@@ -680,14 +680,14 @@
 window_destroyed_cb (GtkObject *object,
                      gpointer   user_data)
 {
-  GropeGestureManager *manager = (GropeGestureManager *)user_data;
-  GropeGestureManagerPrivate *priv = manager->priv;
-  GropeGestureRegistration *reg = g_hash_table_lookup (priv->hash, object);
+  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)
     {
-      GropeGestureBinding *binding = (GropeGestureBinding *)list->data;
+      GripGestureBinding *binding = (GripGestureBinding *)list->data;
 
       if (binding->destroy)
         {
@@ -711,15 +711,15 @@
 
 
 /* Public API */
-GropeGestureManager *
-grope_gesture_manager_get (void)
+GripGestureManager *
+grip_gesture_manager_get (void)
 {
-  return g_object_new (GROPE_TYPE_GESTURE_MANAGER, NULL);
+  return g_object_new (GRIP_TYPE_GESTURE_MANAGER, NULL);
 }
 
 /**
- * grope_gesture_manager_register_window:
- * @manager: A #GropeGestureManager instance.
+ * grip_gesture_manager_register_window:
+ * @manager: A #GripGestureManager instance.
  * @window: A #GtkWindow to register the gesture event for.
  * @gesture_type: The type of gesture event to register.
  * @touch_points: Number of touch points for this gesture.
@@ -729,23 +729,23 @@
  *
  * Registers a toplevel window to receive gesture events.
  * The callback parameters provided will be called by the
- * #GropeGestureManager whenever the user initiates a gesture
+ * #GripGestureManager whenever the user initiates a gesture
  * on the specified window.
  */
 void
-grope_gesture_manager_register_window (GropeGestureManager *manager,
-				       GtkWindow           *window,
-				       GropeGestureType     gesture_type,
-				       gint                 touch_points,
-				       GropeGestureCallback callback,
-                                       gpointer             user_data,
-                                       GDestroyNotify       destroy)
+grip_gesture_manager_register_window (GripGestureManager *manager,
+                                      GtkWindow           *window,
+                                      GripGestureType     gesture_type,
+                                      gint                 touch_points,
+                                      GripGestureCallback callback,
+                                      gpointer             user_data,
+                                      GDestroyNotify       destroy)
 {
-  GropeGestureManagerPrivate *priv;
-  GropeGestureRegistration *reg;
-  GropeGestureBinding *binding;
+  GripGestureManagerPrivate *priv;
+  GripGestureRegistration *reg;
+  GripGestureBinding *binding;
 
-  g_return_if_fail (GROPE_IS_GESTURE_MANAGER (manager));
+  g_return_if_fail (GRIP_IS_GESTURE_MANAGER (manager));
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window)));
 
@@ -787,7 +787,7 @@
           return;
         }
 
-      reg = g_new0 (GropeGestureRegistration, 1);
+      reg = g_new0 (GripGestureRegistration, 1);
 
       reg->window   = window;
       reg->instance = instance;
@@ -813,7 +813,7 @@
     }
 
   /* XXX - check for duplicates in reg->bindings first */
-  binding = g_new0 (GropeGestureBinding, 1);
+  binding = g_new0 (GripGestureBinding, 1);
 
   binding->type     = gesture_type;
   binding->touches  = touch_points;

=== renamed file 'src/gropegesturemanager.h' => 'src/gripgesturemanager.h'
--- src/gropegesturemanager.h	2010-11-18 21:40:02 +0000
+++ src/gripgesturemanager.h	2010-11-22 15:13:53 +0000
@@ -23,46 +23,46 @@
  *    Cody Russell <[e-mail]>
  */
 
-#ifndef __GROPE_GESTURE_MANAGER_H__
-#define __GROPE_GESTURE_MANAGER_H__
+#ifndef __GRIP_GESTURE_MANAGER_H__
+#define __GRIP_GESTURE_MANAGER_H__
 
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#define GROPE_TYPE_GESTURE_MANAGER         (grope_gesture_manager_get_type ())
-#define GROPE_GESTURE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GROPE_TYPE_GESTURE_MANAGER, GropeGestureManager))
-#define GROPE_GESTURE_MANAGER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GROPE_TYPE_GESTURE_MANAGER, GropeGestureManagerClass))
-#define GROPE_IS_GESTURE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GROPE_TYPE_GESTURE_MANAGER))
-#define GROPE_IS_GESTURE_MANAGER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GROPE_TYPE_GESTURE_MANAGER))
-#define GROPE_GESTURE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GROPE_TYPE_GESTURE_MANAGER, GropeGestureManagerClass))
-
-typedef struct _GropeGestureManager        GropeGestureManager;
-typedef struct _GropeGestureManagerClass   GropeGestureManagerClass;
-typedef struct _GropeGestureManagerPrivate GropeGestureManagerPrivate;
-
-typedef union  _GropeGestureEvent       GropeGestureEvent;
-typedef struct _GropeEventGestureDrag   GropeEventGestureDrag;
-typedef struct _GropeEventGesturePinch  GropeEventGesturePinch;
-typedef struct _GropeEventGestureRotate GropeEventGestureRotate;
-typedef struct _GropeEventGestureTap    GropeEventGestureTap;
-
-typedef enum {
-  GROPE_GESTURE_DRAG    = 0,
-  GROPE_GESTURE_PINCH   = 1,
-  GROPE_GESTURE_ROTATE  = 2,
-  GROPE_GESTURE_TAP     = 15
-} GropeGestureType;
-
-typedef enum {
-  GROPE_TIME_START,
-  GROPE_TIME_UPDATE,
-  GROPE_TIME_END
-} GropeTimeType;
-
-struct _GropeEventGestureDrag
+#define GRIP_TYPE_GESTURE_MANAGER         (grip_gesture_manager_get_type ())
+#define GRIP_GESTURE_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GRIP_TYPE_GESTURE_MANAGER, GripGestureManager))
+#define GRIP_GESTURE_MANAGER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GRIP_TYPE_GESTURE_MANAGER, GripGestureManagerClass))
+#define GRIP_IS_GESTURE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GRIP_TYPE_GESTURE_MANAGER))
+#define GRIP_IS_GESTURE_MANAGER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GRIP_TYPE_GESTURE_MANAGER))
+#define GRIP_GESTURE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GRIP_TYPE_GESTURE_MANAGER, GripGestureManagerClass))
+
+typedef struct _GripGestureManager        GripGestureManager;
+typedef struct _GripGestureManagerClass   GripGestureManagerClass;
+typedef struct _GripGestureManagerPrivate GripGestureManagerPrivate;
+
+typedef union  _GripGestureEvent       GripGestureEvent;
+typedef struct _GripEventGestureDrag   GripEventGestureDrag;
+typedef struct _GripEventGesturePinch  GripEventGesturePinch;
+typedef struct _GripEventGestureRotate GripEventGestureRotate;
+typedef struct _GripEventGestureTap    GripEventGestureTap;
+
+typedef enum {
+  GRIP_GESTURE_DRAG    = 0,
+  GRIP_GESTURE_PINCH   = 1,
+  GRIP_GESTURE_ROTATE  = 2,
+  GRIP_GESTURE_TAP     = 15
+} GripGestureType;
+
+typedef enum {
+  GRIP_TIME_START,
+  GRIP_TIME_UPDATE,
+  GRIP_TIME_END
+} GripTimeType;
+
+struct _GripEventGestureDrag
 {
-  GropeGestureType  type;
+  GripGestureType  type;
   guint             id;
   GdkWindow        *window;
   GdkWindow        *root;
@@ -79,9 +79,9 @@
   gdouble           position_y;
 };
 
-struct _GropeEventGesturePinch
+struct _GripEventGesturePinch
 {
-  GropeGestureType  type;
+  GripGestureType  type;
   guint             id;
   GdkWindow        *window;
   GdkWindow        *root;
@@ -95,9 +95,9 @@
   gdouble           radius;
 };
 
-struct _GropeEventGestureRotate
+struct _GripEventGestureRotate
 {
-  GropeGestureType  type;
+  GripGestureType  type;
   guint             id;
   GdkWindow        *window;
   GdkWindow        *root;
@@ -111,9 +111,9 @@
   gdouble           angle;
 };
 
-struct _GropeEventGestureTap
+struct _GripEventGestureTap
 {
-  GropeGestureType  type;
+  GripGestureType  type;
   guint             id;
   GdkWindow        *window;
   GdkWindow        *root;
@@ -126,54 +126,54 @@
   gfloat            position_y;
 };
 
-union _GropeGestureEvent
+union _GripGestureEvent
 {
-  GropeGestureType        type;
-  GropeEventGestureDrag   drag;
-  GropeEventGesturePinch  pinch;
-  GropeEventGestureRotate rotate;
-  GropeEventGestureTap    tap;
+  GripGestureType        type;
+  GripEventGestureDrag   drag;
+  GripEventGesturePinch  pinch;
+  GripEventGestureRotate rotate;
+  GripEventGestureTap    tap;
 };
 
 /**
-   GropeGestureManager
+   GripGestureManager
    @parent: #GObject.
 
    A singleton manager into which a window may be registered to receive
    multitouch gesture events.
  */
-struct _GropeGestureManager
+struct _GripGestureManager
 {
   GObject parent_instance;
 
   /*< Private >*/
-  GropeGestureManagerPrivate *priv;
+  GripGestureManagerPrivate *priv;
 };
 
 /**
-   GropeGestureManagerClass
+   GripGestureManagerClass
    @parent_class: #GObjectClass
 */
-struct _GropeGestureManagerClass
+struct _GripGestureManagerClass
 {
   GObjectClass parent_class;
 };
 
-typedef void (* GropeGestureCallback) (GtkWindow          *window,
-                                       GropeTimeType       time,
-				       GropeGestureEvent  *gesture,
-                                       gpointer            user_data);
+typedef void (* GripGestureCallback) (GtkWindow          *window,
+                                      GripTimeType       time,
+                                      GripGestureEvent  *gesture,
+                                      gpointer            user_data);
 
-GType                grope_gesture_manager_get_type        (void) G_GNUC_CONST;
-GropeGestureManager *grope_gesture_manager_get             (void);
-void                 grope_gesture_manager_register_window (GropeGestureManager *manager,
-							    GtkWindow           *window,
-							    GropeGestureType     gesture_type,
-							    gint                 touch_points,
-							    GropeGestureCallback callback,
-                                                            gpointer             user_data,
-                                                            GDestroyNotify       destroy);
+GType                grip_gesture_manager_get_type        (void) G_GNUC_CONST;
+GripGestureManager *grip_gesture_manager_get              (void);
+void                 grip_gesture_manager_register_window (GripGestureManager *manager,
+                                                           GtkWindow           *window,
+                                                           GripGestureType     gesture_type,
+                                                           gint                 touch_points,
+                                                           GripGestureCallback callback,
+                                                           gpointer             user_data,
+                                                           GDestroyNotify       destroy);
 
 G_END_DECLS
 
-#endif /* __GROPE_GESTURE_MANAGER_H__ */
+#endif /* __GRIP_GESTURE_MANAGER_H__ */

=== renamed file 'src/gropetypebuiltins.c.in' => 'src/griptypebuiltins.c.in'
--- src/gropetypebuiltins.c.in	2010-11-09 18:03:34 +0000
+++ src/griptypebuiltins.c.in	2010-11-22 15:13:53 +0000
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "gropetypebuiltins.h"
+#include "griptypebuiltins.h"
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/

=== renamed file 'src/gropetypebuiltins.h.in' => 'src/griptypebuiltins.h.in'
--- src/gropetypebuiltins.h.in	2010-11-09 18:03:34 +0000
+++ src/griptypebuiltins.h.in	2010-11-22 15:13:53 +0000
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef __GROPE_ENUM_TYPES_H__
-#define __GROPE_ENUM_TYPES_H__
+#ifndef __GRIP_ENUM_TYPES_H__
+#define __GRIP_ENUM_TYPES_H__
 
 #include <glib-object.h>
 
@@ -15,12 +15,12 @@
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* !__GROPE_ENUM_TYPES_H__ */
+#endif /* !__GRIP_ENUM_TYPES_H__ */
 /*** END file-tail ***/
 
 /*** BEGIN value-header ***/
 GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define GROPE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+#define GRIP_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 
 /*** END value-header ***/