Consider connected account which doesn't implement presence as available (#604700)

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index edec6008dcb60733f4cfe4e1c36ffbc951986155..69bb110be39fa70b259f40ddc17bd6413a12659d 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -224,6 +224,14 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
       presence = tp_account_get_current_presence (account, NULL, &status_message);
       account_enabled = tp_account_is_enabled (account);
       creating_account = FALSE;
+
+      if (status == TP_CONNECTION_STATUS_CONNECTED &&
+          (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE ||
+           presence == TP_CONNECTION_PRESENCE_TYPE_UNSET))
+        /* If presence is Unset (CM doesn't implement SimplePresence) but we
+         * are connected, consider ourself as Available.
+         * We also check Offline because of this MC5 bug: fd.o #26060 */
+        presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
     }
   else
     {