diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-09-07 10:04:07 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-09-07 10:04:07 +0100 |
| commit | 32442108b50ade909fa9076513139d73cde577a1 (patch) | |
| tree | f43d4018dc327cd212c09c03c771905a27769753 /src | |
| parent | 71f036ce6cbd106f3754d7008303d1b108433ae2 (diff) | |
| download | ayatana-indicator-sound-32442108b50ade909fa9076513139d73cde577a1.tar.gz ayatana-indicator-sound-32442108b50ade909fa9076513139d73cde577a1.tar.bz2 ayatana-indicator-sound-32442108b50ade909fa9076513139d73cde577a1.zip | |
button release outside of control now acts as it should do
Diffstat (limited to 'src')
| -rw-r--r-- | src/play-button.c | 9 | ||||
| -rw-r--r-- | src/sound-service.c | 4 | ||||
| -rw-r--r-- | src/transport-widget.c | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/play-button.c b/src/play-button.c index 0c2a59a..84af260 100644 --- a/src/play-button.c +++ b/src/play-button.c @@ -431,7 +431,14 @@ play_button_react_to_button_release(GtkWidget* button, PlayButtonEvent command) { g_return_if_fail(IS_PLAY_BUTTON(button)); PlayButtonPrivate* priv = PLAY_BUTTON_GET_PRIVATE(button); - priv->current_command = command; + if(priv->current_command == TRANSPORT_NADA){ + g_debug("returning from the playbutton release because my previous command was nada"); + return; + } + else if(priv->current_command != TRANSPORT_NADA && + command != TRANSPORT_NADA){ + priv->current_command = command; + } cairo_t *cr; diff --git a/src/sound-service.c b/src/sound-service.c index 12f067e..42ce116 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -41,8 +41,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); + //close_pulse_activites(); + //g_main_loop_quit(mainloop); } return; } diff --git a/src/transport-widget.c b/src/transport-widget.c index 4e7ea9c..979f6fd 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -162,9 +162,10 @@ transport_widget_button_release_event (GtkWidget *menuitem, g_value_init(&value, G_TYPE_INT); g_debug("TransportWidget::menu_press_event - going to send value %i", (int)result); g_value_set_int(&value, (int)result); - play_button_react_to_button_release(priv->play_button, result); dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0); - } + } + play_button_react_to_button_release(priv->play_button, result); + return TRUE; } |