diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-07-07 17:13:19 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-07-07 17:13:19 +0100 |
| commit | d243e718b7b271d63cd113af102eb3c9f5d3ee71 (patch) | |
| tree | 40774794183fb80d3b76f0087ac20578e91965cb | |
| parent | 86d5db7950332f942b2b7dba2bd9a921d71e162b (diff) | |
| parent | 8aaa84d760edf04412e8a80c1b876cc74e709cb6 (diff) | |
| download | ayatana-indicator-sound-d243e718b7b271d63cd113af102eb3c9f5d3ee71.tar.gz ayatana-indicator-sound-d243e718b7b271d63cd113af102eb3c9f5d3ee71.tar.bz2 ayatana-indicator-sound-d243e718b7b271d63cd113af102eb3c9f5d3ee71.zip | |
merge in Trevino's gtk3 scroll fix
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | src/indicator-sound.c | 10 |
2 files changed, 24 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index bfc86f8..7cc74a4 100644 --- a/configure.ac +++ b/configure.ac @@ -48,36 +48,42 @@ DBUSMENUGLIB_REQUIRED_VERSION=0.3.101 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 + indicator3-0.4 >= $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-0.4 + 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 - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION 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-0.4 + 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) diff --git a/src/indicator-sound.c b/src/indicator-sound.c index b8c0351..76bf710 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -72,8 +72,8 @@ static GtkLabel * get_label (IndicatorObject * io); 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 @@ indicator_sound_class_init (IndicatorSoundClass *klass) 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 @@ key_release_cb(GtkWidget* widget, GdkEventKey* event, gpointer data) } 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)); |