aboutsummaryrefslogtreecommitdiff
path: root/src/indicator-sound.c
diff options
context:
space:
mode:
authorAndrea Cimitan <andrea.cimitan@canonical.com>2010-11-16 02:17:44 +0100
committerAndrea Cimitan <andrea.cimitan@canonical.com>2010-11-16 02:17:44 +0100
commit510a01f7c97b726cd9ee46ffa30d3b0383b36146 (patch)
tree3c8a8cde441abfee25a98716e82febb228c3e30e /src/indicator-sound.c
parent31bc33331673b761ba7d6e28bbb87da6b2e6e51a (diff)
parenteaee3afe6312a04ce41daed8d380ac5e49616ed6 (diff)
downloadayatana-indicator-sound-510a01f7c97b726cd9ee46ffa30d3b0383b36146.tar.gz
ayatana-indicator-sound-510a01f7c97b726cd9ee46ffa30d3b0383b36146.tar.bz2
ayatana-indicator-sound-510a01f7c97b726cd9ee46ffa30d3b0383b36146.zip
merge from lp:~cjcurran/indicator-sound/keyboard-handling-for-natty
Diffstat (limited to 'src/indicator-sound.c')
-rw-r--r--src/indicator-sound.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 53a4876..b39d064 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -715,7 +715,7 @@ key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
volume_widget_update(VOLUME_WIDGET(priv->volume_widget), new_value);
}
}
- if (IS_TRANSPORT_WIDGET(menuitem) == TRUE) {
+ else if (IS_TRANSPORT_WIDGET(menuitem) == TRUE) {
switch (event->keyval) {
case GDK_Right:
transport_widget_react_to_key_event ( TRANSPORT_WIDGET ( priv->transport_widget ),
@@ -761,7 +761,6 @@ indicator_sound_scroll (IndicatorObject *io, gint delta, IndicatorScrollDirectio
if (device_available == FALSE || current_state == STATE_MUTED)
return;
-
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
GtkWidget* slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));