Application Indicators

Merge lp:~3v1n0/indicator-application/scroll-api-merge into lp:indicator-application/0.4

  1. scroll-api-merge
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 205
Proposed branch: lp:~3v1n0/indicator-application/scroll-api-merge
Merge into: lp:indicator-application/0.4
Diff against target: 42 lines (+4/-4)
2 files modified
configure.ac (+1/-1)
src/indicator-application.c (+3/-3)
To merge this branch: bzr merge lp:~3v1n0/indicator-application/scroll-api-merge
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+66678@code.launchpad.net

Description of the change

Use the "entry-scrolled" signal instead of the old one.
It follows the API change of libindicator, See related bug #804618 for more informations.
Plus fixed the compilation with GTK-2.0

It needs the merge of lp:~3v1n0/libindicator/scroll-api-merge

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-06-22 16:22:45 +0000
3+++ configure.ac 2011-07-02 03:55:05 +0000
4@@ -64,7 +64,7 @@
5 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
6 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
7
8- PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
9+ PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
10 ],
11 [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
12 )
13
14=== modified file 'src/indicator-application.c'
15--- src/indicator-application.c 2011-03-11 22:28:20 +0000
16+++ src/indicator-application.c 2011-07-02 03:55:05 +0000
17@@ -109,7 +109,7 @@
18 static void indicator_application_finalize (GObject *object);
19 static GList * get_entries (IndicatorObject * io);
20 static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
21-static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
22+static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
23 void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
24 static void connected (IndicatorApplication * application);
25 static void disconnected (IndicatorApplication * application);
26@@ -144,7 +144,7 @@
27
28 io_class->get_entries = get_entries;
29 io_class->get_location = get_location;
30- io_class->scroll_entry = scroll_entry;
31+ io_class->entry_scrolled = entry_scrolled;
32
33 return;
34 }
35@@ -403,7 +403,7 @@
36 }
37
38 /* Redirect the scroll event to the Application Item */
39-static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) {
40+static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) {
41
42 g_return_if_fail(IS_INDICATOR_APPLICATION(io));
43

Subscribers

People subscribed via source and target branches