diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-11-10 16:29:51 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-11-10 16:29:51 +0000 |
| commit | 9cb1df02b3e5e087ea8191daf24f89e7bf02fbf9 (patch) | |
| tree | 26136e012ee2db0734385f7d1877dcb3f862d9bd | |
| parent | 643fad353455800752d300f226badc047cb91fef (diff) | |
| parent | cd218c8b6b039316e44027bb53bd4dd19e640a22 (diff) | |
| download | libayatana-appindicator-9cb1df02b3e5e087ea8191daf24f89e7bf02fbf9.tar.gz libayatana-appindicator-9cb1df02b3e5e087ea8191daf24f89e7bf02fbf9.tar.bz2 libayatana-appindicator-9cb1df02b3e5e087ea8191daf24f89e7bf02fbf9.zip | |
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. Fixes: 1071738
Approved by: Sebastien Bacher, PS Jenkins bot
| -rw-r--r-- | m4/gcov.m4 | 2 | ||||
| -rw-r--r-- | src/app-indicator.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -30,7 +30,7 @@ AC_DEFUN([AC_TDD_GCOV], 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) diff --git a/src/app-indicator.c b/src/app-indicator.c index 0fc577d..ff06a08 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -526,7 +526,7 @@ app_indicator_class_init (AppIndicatorClass *klass) * 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 @@ app_indicator_class_init (AppIndicatorClass *klass) 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 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, GVariant * retval = NULL; if (g_strcmp0(method, "Scroll") == 0) { - guint direction; + GdkScrollDirection direction; gint delta; const gchar *orientation; |