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

[Marco Trevisan (Treviño)]

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

=== modified file 'configure.ac'
--- configure.ac	2011-06-22 16:22:45 +0000
+++ configure.ac	2011-07-02 03:55:05 +0000
@@ -64,7 +64,7 @@
                                        dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
                                        dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 
-         PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
+         PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )
 
=== modified file 'src/indicator-application.c'
--- src/indicator-application.c	2011-03-11 22:28:20 +0000
+++ src/indicator-application.c	2011-07-02 03:55:05 +0000
@@ -109,7 +109,7 @@
 static void indicator_application_finalize   (GObject *object);
 static GList * get_entries (IndicatorObject * io);
 static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
-static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
+static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
 void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
 static void connected (IndicatorApplication * application);
 static void disconnected (IndicatorApplication * application);
@@ -144,7 +144,7 @@
 
 	io_class->get_entries = get_entries;
 	io_class->get_location = get_location;
-	io_class->scroll_entry = scroll_entry;
+	io_class->entry_scrolled = entry_scrolled;
 
 	return;
 }
@@ -403,7 +403,7 @@
 }
 
 /* Redirect the scroll event to the Application Item */
-static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) {
+static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) {
 	
 	g_return_if_fail(IS_INDICATOR_APPLICATION(io));