Fix properties.

3 files changed, 93 insertions, 78 deletions

diff --git a/example/gesture.c b/example/gesture.c
index da5c65e..22bbd8b 100644
--- a/example/gesture.c
+++ b/example/gesture.c
@@ -97,8 +97,6 @@ pinch_update (GtkWindow       *window,
 
   scale += e->radius_delta / 100;
 
-  g_print ("radius_delta == %f, scale is now %f\n", e->radius_delta, scale);
-
   gtk_widget_queue_draw (GTK_WIDGET (window));
 }
 
diff --git a/gtk-doc.make b/gtk-doc.make
index 0f87cc7..57fab98 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,13 +5,13 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
+GTKDOC_RUN =
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -31,7 +31,9 @@ EXTRA_DIST = 				\
 	$(DOC_MODULE)-overrides.txt
 
 DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+	pdf-build.stamp \
+	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+	$(srcdir)/pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -48,12 +50,23 @@ REPORT_FILES = \
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
-all-local: html-build.stamp
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 else
 all-local:
 endif
 
-docs: html-build.stamp
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
@@ -62,9 +75,12 @@ $(REPORT_FILES): sgml-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -72,7 +88,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
 	    done \
 	fi
-	touch scan-build.stamp
+	@touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
@@ -82,24 +98,26 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
+	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
 
-tmpl/*.sgml:
+$(srcdir)/tmpl/*.sgml:
 	@true
 
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
+	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  done ; \
+	  cd $(srcdir) && \
+	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
@@ -109,18 +127,37 @@ sgml.stamp: sgml-build.stamp
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	mkhtml_options=""; \
+	@rm -rf $(srcdir)/html
+	@mkdir $(srcdir)/html
+	@mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
 	  mkhtml_options=--path="$(srcdir)"; \
-	fi
-	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	fi; \
+	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
+	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	@touch html-build.stamp
+
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building PDF'
+	@-chmod -R u+w $(srcdir)
+	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+	@mkpdf_imgdirs=""; \
+	if test "x$(HTML_IMAGES)" != "x"; then \
+	  for img in $(HTML_IMAGES); do \
+	    part=`dirname $$img`; \
+	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    if test $$? != 0; then \
+	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	    fi; \
+	  done; \
+	fi; \
+	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	@touch pdf-build.stamp
 
 ##############
 
@@ -130,14 +167,14 @@ clean-local:
 
 distclean-local:
 	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
+	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
+	@installfiles=`echo $(srcdir)/html/*`; \
 	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -157,12 +194,11 @@ install-data-local:
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
-	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
 
 uninstall-local:
-	if test -n "$(DOC_MODULE_VERSION)"; then \
+	@if test -n "$(DOC_MODULE_VERSION)"; then \
 	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
 	else \
 	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
@@ -182,15 +218,13 @@ endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
 	mkdir $(distdir)/html
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	! which gtkdoc-rebase >/dev/null 2>&1 || \
-	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff --git a/src/idogesturemanager.c b/src/idogesturemanager.c
index cc9bbf0..5225d10 100644
--- a/src/idogesturemanager.c
+++ b/src/idogesturemanager.c
@@ -183,38 +183,37 @@ pinch_gesture_handle_properties (IdoEventGesturePinch *event,
 
   for (i = 0; i < attr_count; ++i)
     {
-      //g_print ("attr == %s\n", attrs[i].name);
-      if (g_strcmp0 (attrs[i].name, "fingers") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FINGERS) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           touches = attrs[i].integer_val;
         }
-      if (g_strcmp0 (attrs[i].name, "timestamp") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           event->timestamp = attrs[i].integer_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_y = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "radius delta") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_RADIUS_DELTA) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->radius_delta = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "radial velocity") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_RADIAL_VELOCITY) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->radial_velocity = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "radius") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_RADIUS) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->radius = attrs[i].float_val;
@@ -234,52 +233,52 @@ drag_gesture_handle_properties (IdoEventGestureDrag *event,
 
   for (i = 0; i < attr_count; ++i)
     {
-      if (g_strcmp0 (attrs[i].name, "fingers") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FINGERS) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           touches = attrs[i].integer_val;
         }
-      if (g_strcmp0 (attrs[i].name, "timestamp") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           event->timestamp = attrs[i].integer_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_y = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "delta X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_DELTA_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->delta_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "delta Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_DELTA_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->delta_y = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "velocity X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_VELOCITY_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->velocity_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "velocity Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_VELOCITY_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->velocity_y = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "position X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_POSITION_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->position_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "position Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_POSITION_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->position_y = attrs[i].float_val;
@@ -299,37 +298,37 @@ rotate_gesture_handle_properties (IdoEventGestureRotate *event,
 
   for (i = 0; i < attr_count; ++i)
     {
-      if (g_strcmp0 (attrs[i].name, "fingers") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FINGERS) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           touches = attrs[i].integer_val;
         }
-      if (g_strcmp0 (attrs[i].name, "timestamp") == 0 &&
+      if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_TIMESTAMP) == 0 &&
           attrs[i].type == GEIS_ATTR_TYPE_INTEGER)
         {
           event->timestamp = attrs[i].integer_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus X") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_X) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_x = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "focus Y") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_FOCUS_Y) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->focus_y = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "angle delta") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_ANGLE_DELTA) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->angle_delta = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "angular velocity") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_ANGULAR_VELOCITY) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->angular_velocity = attrs[i].float_val;
         }
-      else if (g_strcmp0 (attrs[i].name, "angle") == 0 &&
+      else if (g_strcmp0 (attrs[i].name, GEIS_GESTURE_ATTRIBUTE_ANGLE) == 0 &&
                attrs[i].type == GEIS_ATTR_TYPE_FLOAT)
         {
           event->angle = attrs[i].float_val;
@@ -368,14 +367,10 @@ gesture_start (void              *cookie,
   IdoGestureRegistration *reg = (IdoGestureRegistration *)cookie;
   GList *l = NULL;
 
-  //g_print ("start, type == %d\n", type);
-
   for (l = reg->bindings; l != NULL; l = l->next)
     {
       IdoGestureBinding *binding = (IdoGestureBinding *)l->data;
 
-      //g_print ("   binding->type == %d, touches == %d\n", binding->type, binding->touches);
-
       if (binding->type == type)
         {
           if (type == IDO_GESTURE_DRAG)
@@ -388,8 +383,6 @@ gesture_start (void              *cookie,
                                                              attr_count,
                                                              attrs);
 
-              g_print ("drag.fingers == %d\n", drag.fingers);
-
               if (drag.fingers == binding->touches)
                 {
                   binding->start (reg->window,
@@ -406,8 +399,6 @@ gesture_start (void              *cookie,
                                                                attr_count,
                                                                attrs);
 
-              g_print ("pinch.fingers == %d\n", pinch.fingers);
-
               if (pinch.fingers == binding->touches)
                 {
                   binding->start (reg->window,
@@ -424,8 +415,6 @@ gesture_start (void              *cookie,
                                                                  attr_count,
                                                                  attrs);
 
-              g_print ("rotate.fingers == %d\n", rotate.fingers);
-
               if (rotate.fingers == binding->touches)
                 {
                   binding->start (reg->window,
@@ -448,8 +437,6 @@ gesture_update (void              *cookie,
   IdoGestureRegistration *reg = (IdoGestureRegistration *)cookie;
   GList *l = NULL;
 
-  //g_print ("update %d\n", type);
-
   for (l = reg->bindings; l != NULL; l = l->next)
     {
       IdoGestureBinding *binding = (IdoGestureBinding *)l->data;
@@ -518,8 +505,6 @@ gesture_finish (void              *cookie,
   IdoGestureRegistration *reg = (IdoGestureRegistration *)cookie;
   GList *l = NULL;
 
-  //g_print ("finish\n");
-
   for (l = reg->bindings; l != NULL; l = l->next)
     {
       IdoGestureBinding *binding = (IdoGestureBinding *)l->data;
@@ -697,8 +682,6 @@ ido_gesture_manager_register_window (IdoGestureManager *manager,
   /* XXX - check for duplicates in reg->bindings first */
   binding = g_new0 (IdoGestureBinding, 1);
 
-  g_print (" *** Adding binding type %d\n", (gint)gesture_type);
-
   binding->type    = gesture_type;
   binding->touches = touch_points;
   binding->start   = start;