Merge lp:~jpakkane/libgrip/unbreaking into lp:libgrip

[Jussi Pakkanen]

Building works and produces working binaries.

[Stephen M. Webb (bregma)]

I hate to be picky, but could you update the documented parameters to grip_gesture_manager_register_window() (in gripgestiremanager.h) in this change to match the actual parameters? I had to look twice to figure out what was going on.

Just that and I think this is good to go.

review: Needs Fixing

[Jussi Pakkanen (jpakkane)]

Is it OK now?

[lp:~jpakkane/libgrip/unbreaking]

49. By Jussi Pakkanen on 2011-06-20

Fixed documentation for register_window.

[Stephen M. Webb (bregma)]

Absolutely.

review: Approve

[Chase Douglas (chasedouglas)]

Thanks Jussi! I thought stuff was buildable, but I couldn't test when I merged stuff last week while I was at the Qt conference. Sorry for messing things up!

=== modified file 'Makefile.am'
--- Makefile.am	2011-06-14 17:39:10 +0000
+++ Makefile.am	2011-06-20 13:07:28 +0000
@@ -1,8 +1,5 @@
 SUBDIRS = src bindings examples/rectangle-mover
 
-libgrip.pc: libgrip.pc
-	cp -f libgrip.pc libgrip.pc
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgrip.pc
 
 
=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2011-06-17 11:37:17 +0000
+++ examples/rectangle-mover/gesture.c	2011-06-20 13:07:28 +0000
@@ -116,32 +116,32 @@
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_PINCH,
+                                        GRIP_DEVICE_ALL,
                                         2,
-                                        GRIP_DEVICE_ALL,
                                         gesture_callback,
                                         NULL, NULL);
 
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_ROTATE,
+                                        GRIP_DEVICE_ALL,
                                         2,
-                                        GRIP_DEVICE_ALL,
                                         gesture_callback,
                                         NULL, NULL);
 
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_DRAG,
+                                        GRIP_DEVICE_ALL,
                                         2,
-                                        GRIP_DEVICE_ALL,
                                         gesture_callback,
                                         NULL, NULL);
 
   grip_gesture_manager_register_window (manager,
                                         da,
                                         GRIP_GESTURE_TAP,
+                                        GRIP_DEVICE_ALL,
                                         2,
-                                        GRIP_DEVICE_ALL,
                                         gesture_callback,
                                         NULL, NULL);
 }
 
=== modified file 'src/gripgesturemanager.h'
--- src/gripgesturemanager.h	2011-06-17 11:37:17 +0000
+++ src/gripgesturemanager.h	2011-06-20 13:07:28 +0000
@@ -209,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