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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/indicator-sound.c | 10 |
1 files changed, 5 insertions, 5 deletions
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)); |