Merge lp:~3v1n0/indicator-sound/scroll-api-merge into lp:indicator-sound/fourth

[Marco Trevisan (Treviño)]

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

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

[Conor Curran (cjcurran)]

Thanks Trevino, will merge in and release for Thursday.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Nice, however before merging it, wait for the merge of lp:~3v1n0/libindicator/scroll-api-merge too (otherwise it won't compile :P).

[Conor Curran (cjcurran)]

will do.

[Marco Trevisan (Treviño) (3v1n0)]

Ok, that libindicator branch is now merged, you can proceed with indicator-sound too :)

[Conor Curran (cjcurran)]

review: Approve

[Conor Curran (cjcurran)]

On hold until the new libindicator is released.

=== modified file 'configure.ac'
--- configure.ac	2011-06-28 13:50:44 +0000
+++ configure.ac	2011-07-02 03:54:28 +0000
@@ -48,12 +48,23 @@
 GIO_2_0_REQUIRED_VERSION=2.25.13
 LIBNOTIFY_REQUIRED_VERSION=0.7.0
 
+PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
+                              gio-unix-2.0)
+AC_SUBST(PULSEAUDIO_CFLAGS)
+AC_SUBST(PULSEAUDIO_LIBS)
+
 AS_IF([test "x$with_gtk" = x3],
     [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                indicator3 >= $INDICATOR_REQUIRED_VERSION
                                dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
                                libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
+
+     PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                     indicator3
+                                     gee-1.0
+                                     gio-unix-2.0
+                                     libxml-2.0)
         ],
       [test "x$with_gtk" = x2],
     [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
@@ -61,23 +72,18 @@
                                dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
                                libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
+
+     PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                     indicator
+                                     gee-1.0
+                                     gio-unix-2.0
+                                     libxml-2.0)
         ],
     [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
-
-PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
-                              gio-unix-2.0)
-AC_SUBST(PULSEAUDIO_CFLAGS)
-AC_SUBST(PULSEAUDIO_LIBS)
-
-PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                indicator3 >= $INDICATOR_REQUIRED_VERSION
-                                gee-1.0
-                                gio-unix-2.0
-                                libxml-2.0)
 AC_SUBST(SOUNDSERVICE_CFLAGS)
 AC_SUBST(SOUNDSERVICE_LIBS)
 

=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c	2011-06-22 19:19:49 +0000
+++ src/indicator-sound.c	2011-07-02 03:54:28 +0000
@@ -72,8 +72,8 @@
 static GtkImage * get_icon (IndicatorObject * io);
 static GtkMenu *  get_menu (IndicatorObject * io);
 static const gchar * get_accessible_desc (IndicatorObject * io);
-static void indicator_sound_scroll (IndicatorObject* io,
-                                    gint delta,
+static void indicator_sound_scroll (IndicatorObject * io,
+                                    IndicatorObjectEntry * entry, gint delta,
                                     IndicatorScrollDirection direction);
 
 //key/moust event handlers
@@ -124,7 +124,7 @@
   io_class->get_image = get_icon;
   io_class->get_menu  = get_menu;
   io_class->get_accessible_desc = get_accessible_desc;
-  io_class->scroll    = indicator_sound_scroll;
+  io_class->entry_scrolled = indicator_sound_scroll;
 }
 
 static void
@@ -648,8 +648,8 @@
 }
 
 static void
-indicator_sound_scroll (IndicatorObject *io, gint delta, 
-                        IndicatorScrollDirection direction)
+indicator_sound_scroll (IndicatorObject * io, IndicatorObjectEntry * entry,
+                        gint delta, IndicatorScrollDirection direction)
 {
   //g_debug("indicator-sound-scroll - current slider value");
   IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));