Merge lp:~larsu/libappindicator/lp1071738 into lp:libappindicator/15.04

[Lars Karlitski]

scroll-event: change parameter to the right type

The scroll-direction parameter is of type uint, but the annotation says that it's of Gdk.ScrollDirection. Thus, bindings always see 0 for that parameter.

This commit changes the actual type of the parameter instead of the annotation. This should be API compatible for C while still maintaining the proper type for bindings.

scroll-event: change parameter to the right type

The scroll-direction parameter is of type uint, but the annotation says that it's of Gdk.ScrollDirection. Thus, bindings always see 0 for that parameter.

This commit changes the actual type of the parameter instead of the annotation. This should be API compatible for C while still maintaining the proper type for bindings.

[Sebastien Bacher (seb128)]

thanks, looks fine to me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libappindicator-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larsu/libappindicator/lp1071738]

272. By Lars Karlitski on 2014-11-10

gcov.m4: add lcov 1.11

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/libappindicator-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libappindicator-ci/21/rebuild

review: Approve (continuous-integration)

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2013-12-19 16:33:24 +0000
+++ m4/gcov.m4	2014-11-10 10:06:15 +0000
@@ -30,7 +30,7 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
 

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2013-04-19 12:07:21 +0000
+++ src/app-indicator.c	2014-11-10 10:06:15 +0000
@@ -526,7 +526,7 @@
 	 * AppIndicator::scroll-event:
 	 * @arg0: The #AppIndicator object
 	 * @arg1: How many steps the scroll wheel has taken
-	 * @arg2: (type Gdk.ScrollDirection) Which direction the wheel went in
+	 * @arg2: (type Gdk.ScrollDirection): Which direction the wheel went in
 	 *
 	 * Signaled when the #AppIndicator receives a scroll event.
 	 */
@@ -536,7 +536,7 @@
 	                                  G_STRUCT_OFFSET (AppIndicatorClass, scroll_event),
 	                                  NULL, NULL,
 	                                  _application_service_marshal_VOID__INT_UINT,
-	                                  G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_UINT);
+	                                  G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION);
 
 	/* DBus interfaces */
 	if (item_node_info == NULL) {
@@ -1064,7 +1064,7 @@
 	GVariant * retval = NULL;
 
 	if (g_strcmp0(method, "Scroll") == 0) {
-		guint direction;
+		GdkScrollDirection direction;
 		gint delta;
 		const gchar *orientation;