diff -Nru libappindicator-12.10.1+13.10.20130920/debian/changelog libappindicator-12.10.1+15.04.20141110/debian/changelog --- libappindicator-12.10.1+13.10.20130920/debian/changelog 2014-11-10 16:35:21.000000000 +0000 +++ libappindicator-12.10.1+15.04.20141110/debian/changelog 2014-11-10 16:35:21.000000000 +0000 @@ -1,3 +1,10 @@ +libappindicator (12.10.1+15.04.20141110-0ubuntu1) vivid; urgency=low + + [ Lars Uebernickel ] + * scroll-event: change parameter to the right type + + -- Ubuntu daily release Mon, 10 Nov 2014 16:30:06 +0000 + libappindicator (12.10.1+13.10.20130920-0ubuntu4) trusty; urgency=medium * Rebuild to drop files installed into /usr/share/pyshared. diff -Nru libappindicator-12.10.1+13.10.20130920/m4/gcov.m4 libappindicator-12.10.1+15.04.20141110/m4/gcov.m4 --- libappindicator-12.10.1+13.10.20130920/m4/gcov.m4 2013-09-20 10:15:14.000000000 +0000 +++ libappindicator-12.10.1+15.04.20141110/m4/gcov.m4 2014-11-10 16:29:51.000000000 +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" + 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) diff -Nru libappindicator-12.10.1+13.10.20130920/src/app-indicator.c libappindicator-12.10.1+15.04.20141110/src/app-indicator.c --- libappindicator-12.10.1+13.10.20130920/src/app-indicator.c 2013-09-20 10:15:14.000000000 +0000 +++ libappindicator-12.10.1+15.04.20141110/src/app-indicator.c 2014-11-10 16:29:51.000000000 +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;