Merge back from master

[empathy.git] / src / empathy-status-icon.c

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 79e59c5f5368abc2d25d8262df6ae4414a92b7ca..430c9334393778c00d2f4538ed8736f97b264ca1 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -138,7 +138,10 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
        }
 
        if (priv->event) {
-               gchar *message_esc = g_markup_escape_text (priv->event->message, -1);
+               gchar *message_esc = NULL;
+
+               if (priv->event->message != NULL)
+                       message_esc = g_markup_escape_text (priv->event->message, -1);
 
                if (priv->notification) {
                        notify_notification_update (priv->notification,
@@ -311,24 +314,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
        if (!visible) {
                empathy_window_iconify (priv->window, priv->icon);
        } else {
-               GList *accounts;
-               GList *l;
-               gboolean one_enabled = FALSE;
-
                empathy_window_present (GTK_WINDOW (priv->window), TRUE);
-
-               /* Show the accounts dialog if there is no enabled accounts */
-               accounts = empathy_account_manager_dup_accounts (priv->account_manager);
-               for (l = accounts ; l != NULL ; l = g_list_next (l)) {
-                       one_enabled = empathy_account_is_enabled (EMPATHY_ACCOUNT (l->data))
-                               || one_enabled;
-                       g_object_unref (l->data);
-               }
-               g_list_free (accounts);
-               if (!one_enabled) {
-                       DEBUG ("No enabled account, Showing account dialog");
-                       empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL);
-               }
        }
 }