Merge lp:~bregma/libgrip/lp-861596 into lp:libgrip

[Stephen M. Webb]

(1) Made the generated introspection library have a name that conforms to the GObject introspection runtime requirements (fixes lp:861596).

(2) Renamed the typedef AxisExtents to GripAxisExtents to fix the GObject introspection runtime build failure (this is an API breakage but not an ABI breakage). The API change does not affect eog or evince but may affect unknown third-paty usage.

(3) Turned all g-ir-scanner warnings into errors so the build will break instead of silently producing non-working software.

[Stephen M. Webb (bregma)]

Added another commit to reintroduce the AxisExtents symbol, marked it as deprecated, and reverted the API change. Good to go.

[Chase Douglas (chasedouglas)]

Looks good now that we don't break the API. I assume you meant to name the macro G_IR_IGNORE instead of G_IR_IGNIORE though. I'm approving with that changed to proper english :).

review: Approve

[lp:~bregma/libgrip/lp-861596]

66. By Stephen M. Webb on 2011-10-19

Re-added AxisExtents symbol, marked it as deprecated, and forced g-ir-scanner to ignore that particular symbol.

=== modified file 'examples/rectangle-mover/Makefile.am'
--- examples/rectangle-mover/Makefile.am	2011-06-14 17:39:10 +0000
+++ examples/rectangle-mover/Makefile.am	2011-10-19 18:09:23 +0000
@@ -12,4 +12,4 @@
 	$(GTK_CFLAGS)		\
 	$(MAINTAINER_CFLAGS)
 
-grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS)
+grip_test_LDADD = $(top_builddir)/src/libgrip.la $(GTK_LIBS) -lm
 
=== modified file 'examples/rectangle-mover/gesture.c'
--- examples/rectangle-mover/gesture.c	2011-08-04 01:09:42 +0000
+++ examples/rectangle-mover/gesture.c	2011-10-19 18:09:23 +0000
@@ -74,13 +74,15 @@
             GripEventGesturePinch *e = (GripEventGesturePinch *)event;
             GtkWindow *toplevel = (GtkWindow *)gtk_widget_get_toplevel (widget);
             gint window_width, window_height;
-            AxisExtents *x = grip_input_device_get_x_extents (e->input_device);
-            AxisExtents *y = grip_input_device_get_y_extents (e->input_device);
+            const GripAxisExtents *x;
+            const GripAxisExtents *y;
             gfloat width = 0;
             gfloat height = 0;
             gfloat factor = 0;
 
             gtk_window_get_size (toplevel, &window_width, &window_height);
+            x = grip_input_device_get_x_extents (e->input_device);
+            y = grip_input_device_get_y_extents (e->input_device);
             width = window_width / (x->maximum - x->minimum);
             height = window_height / (y->maximum - y->minimum);
             factor = sqrtf (width * width + height * height) / 5.2723;
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-08-04 01:04:47 +0000
+++ src/Makefile.am	2011-10-19 18:09:23 +0000
@@ -40,16 +40,17 @@
 
 irscanner_headers = $(patsubst %,$(srcdir)/%,$(sources_h))
 Grip.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
-	$(INTROSPECTION_SCANNER)						\
-		-v --namespace Grip						\
-		--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-3.0						\
-		--library=grip							\
+	$(INTROSPECTION_SCANNER)					\
+		-v --namespace Grip					\
+		--nsversion=0.2						\
+		--warn-all --warn-error					\
+		-DG_IR_IGNORE						\
+		--libtool=$(top_builddir)/libtool			\
+		--add-include-path=$(srcdir) $(GTK_CFLAGS)		\
+		--include=GObject-2.0					\
+		--include=GLib-2.0					\
+		--include=Gtk-3.0					\
+		--library=grip						\
 		--output Grip.gir $(irscanner_headers)			\
 		$(addprefix --c-include=src/, $(grip_headers))
 
@@ -59,8 +60,8 @@
 gir_DATA = $(BUILT_GIRSOURCES)
 
 typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=-1.0.typelib)
+%-1.0.typelib: %.gir $(INTROSPECTION_COMPILER)
 	$(INTROSPECTION_COMPILER)			\
 		--includedir=$(srcdir)			\
 		--includedir=.				\
 
=== modified file 'src/gripinputdevice.c'
--- src/gripinputdevice.c	2011-08-09 08:35:09 +0000
+++ src/gripinputdevice.c	2011-10-19 18:09:23 +0000
@@ -37,8 +37,8 @@
   gint               touches;
   gboolean           is_direct;
   gboolean           is_independent;
-  AxisExtents        x_extents;
-  AxisExtents        y_extents;
+  GripAxisExtents    x_extents;
+  GripAxisExtents    y_extents;
 };
 
 
@@ -250,7 +250,7 @@
  *
  * Returns: the X-axis extents of the device.
  */
-AxisExtents *
+const GripAxisExtents *
 grip_input_device_get_x_extents(GripInputDevice *input_device)
 {
   return &input_device->priv->x_extents;
@@ -263,7 +263,7 @@
  *
  * Returns: the Y-axis extents of the device.
  */
-AxisExtents *
+const GripAxisExtents *
 grip_input_device_get_y_extents(GripInputDevice *input_device)
 {
   return &input_device->priv->y_extents;
 
=== modified file 'src/gripinputdevice.h'
--- src/gripinputdevice.h	2011-08-09 08:35:09 +0000
+++ src/gripinputdevice.h	2011-10-19 18:09:23 +0000
@@ -47,13 +47,21 @@
  * recognition stack.
  */
 
-typedef struct AxisExtents
+typedef struct GripAxisExtents
 {
   gfloat minimum;
   gfloat maximum;
   gfloat resolution;
-} AxisExtents;
+} GripAxisExtents;
 
+#ifndef G_IR_IGNORE
+/**
+ * AxisExtents: (skip)
+ *
+ * A deprecated name for GripAxisExtents.
+ */
+typedef GripAxisExtents AxisExtents __attribute__((deprecated));
+#endif
 
 GType grip_input_device_get_type (void) G_GNUC_CONST;
 
@@ -107,10 +115,10 @@
 gboolean
 grip_input_device_is_independent(GripInputDevice *input_device);
 
-AxisExtents *
+const GripAxisExtents *
 grip_input_device_get_x_extents(GripInputDevice *input_device);
 
-AxisExtents *
+const GripAxisExtents *
 grip_input_device_get_y_extents(GripInputDevice *input_device);