diff options
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 1 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 19 |
2 files changed, 12 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 83141afbf..da658dac6 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1513,7 +1513,6 @@ empathy_sound_pref_is_enabled (const char *key) presence = empathy_idle_get_state (idle); g_object_unref (idle); - if (presence != MC_PRESENCE_AVAILABLE && presence != MC_PRESENCE_UNSET) { empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY, diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 58c4a0184..c286b0399 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1116,7 +1116,9 @@ main_window_status_changed_cb (MissionControl *mc, const gchar *unique_name, EmpathyMainWindow *window) { - McAccount *account; + McAccount *account; + McPresence old_state; + EmpathyIdle *idle; main_window_update_status (window); @@ -1174,7 +1176,14 @@ main_window_status_changed_cb (MissionControl *mc, main_window_error_display (window, account, message); } + idle = empathy_idle_new (); + old_state = empathy_idle_get_state (idle); + + /* play the sound only when the state changes from the current to + * UNSET, as we receive this signal two times when disconnecting. + */ if (status == TP_CONNECTION_STATUS_DISCONNECTED && + old_state != MC_PRESENCE_UNSET && empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT)) { ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0, CA_PROP_EVENT_ID, "service-logout", @@ -1184,15 +1193,12 @@ main_window_status_changed_cb (MissionControl *mc, if (status == TP_CONNECTION_STATUS_CONNECTED) { GtkWidget *error_widget; - EmpathyIdle *idle; - - idle = empathy_idle_new (); /* emit the sound only on first connect, i.e. when the saved * idle state is MC_PRESENCE_UNSET. */ - if (empathy_idle_get_state (idle) == MC_PRESENCE_UNSET && + if (old_state == MC_PRESENCE_UNSET && empathy_sound_pref_is_enabled (EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN)) { ca_gtk_play_for_widget (GTK_WIDGET (window->window), 0, CA_PROP_EVENT_ID, "service-login", @@ -1200,8 +1206,6 @@ main_window_status_changed_cb (MissionControl *mc, NULL); } - g_object_unref (idle); - /* Account connected without error, remove error message if any */ error_widget = g_hash_table_lookup (window->errors, account); if (error_widget) { @@ -1211,6 +1215,7 @@ main_window_status_changed_cb (MissionControl *mc, } g_object_unref (account); + g_object_unref (idle); } static void |