Import upstream version 12.10.0

2 files changed, 48 insertions, 19 deletions

diff --git a/example/Makefile.in b/example/Makefile.in
index db2e1d4..3b7e206 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,7 +59,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -100,6 +118,11 @@ am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(simple_client_SOURCES) $(simple_client_vala_SOURCES)
 DIST_SOURCES = $(simple_client_SOURCES) \
 	$(am__simple_client_vala_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -117,6 +140,9 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@@ -138,7 +164,9 @@ GAPI_CODEGEN = @GAPI_CODEGEN@
 GAPI_FIXUP = @GAPI_FIXUP@
 GAPI_LIBS = @GAPI_LIBS@
 GAPI_PARSER = @GAPI_PARSER@
+GCOVR = @GCOVR@
 GENERATED_SOURCES = @GENERATED_SOURCES@
+GENHTML = @GENHTML@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GREP = @GREP@
@@ -163,6 +191,7 @@ INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
 INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -215,6 +244,7 @@ RUNTIME = @RUNTIME@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
 TESTDEPS_LIBS = @TESTDEPS_LIBS@
diff --git a/example/simple-client-vala.c b/example/simple-client-vala.c
index 4307157..b90b8b3 100644
--- a/example/simple-client-vala.c
+++ b/example/simple-client-vala.c
@@ -1,4 +1,4 @@
-/* simple-client-vala.c generated by valac 0.15.2, the Vala compiler
+/* simple-client-vala.c generated by valac 0.16.1, the Vala compiler
  * generated from simple-client-vala.vala, do not modify */
 
 /*
@@ -29,6 +29,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <string.h>
 #include <gtk/gtk.h>
 
+#include <gdk/gdk.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -122,8 +123,9 @@ static void ___lambda5__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer s
 static void simple_client_label_toggle (SimpleClient* self, GtkMenuItem* item);
 static Block2Data* block2_data_ref (Block2Data* _data2_);
 static void block2_data_unref (void * _userdata_);
-static void __lambda6_ (SimpleClient* self, gint delta, guint direction);
-static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self);
+static void __lambda6_ (SimpleClient* self, gint delta, GdkScrollDirection direction);
+const gchar* gdk_scroll_direction_to_string (GdkScrollDirection self);
+static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, GdkScrollDirection direction, gpointer self);
 static gboolean __lambda7_ (SimpleClient* self);
 static gboolean ___lambda7__gsource_func (gpointer self);
 static void __lambda8_ (SimpleClient* self);
@@ -416,31 +418,28 @@ static void block2_data_unref (void * _userdata_) {
 }
 
 
-static void __lambda6_ (SimpleClient* self, gint delta, guint direction) {
+static void __lambda6_ (SimpleClient* self, gint delta, GdkScrollDirection direction) {
 	gint _tmp0_;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_;
-	guint _tmp3_;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_;
+	GdkScrollDirection _tmp3_;
+	GEnumValue* _tmp4_;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_;
 	_tmp0_ = delta;
 	_tmp1_ = g_strdup_printf ("%i", _tmp0_);
 	_tmp2_ = _tmp1_;
 	_tmp3_ = direction;
-	_tmp4_ = g_strdup_printf ("%u", _tmp3_);
-	_tmp5_ = _tmp4_;
-	_tmp6_ = g_strconcat ("Got scroll event! delta: ", _tmp2_, ", direction: ", _tmp5_, "\n", NULL);
-	_tmp7_ = _tmp6_;
-	g_print ("%s", _tmp7_);
-	_g_free0 (_tmp7_);
-	_g_free0 (_tmp5_);
+	_tmp4_ = g_enum_get_value (g_type_class_ref (GDK_TYPE_SCROLL_DIRECTION), _tmp3_);
+	_tmp5_ = g_strconcat ("Got scroll event! delta: ", _tmp2_, ", direction: ", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL, "\n", NULL);
+	_tmp6_ = _tmp5_;
+	g_print ("%s", _tmp6_);
+	_g_free0 (_tmp6_);
 	_g_free0 (_tmp2_);
 }
 
 
-static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, guint direction, gpointer self) {
+static void ___lambda6__app_indicator_scroll_event (AppIndicator* _sender, gint delta, GdkScrollDirection direction, gpointer self) {
 	__lambda6_ (self, delta, direction);
 }