]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-utils.c
Updated Polish translation
[empathy.git] / libempathy / empathy-utils.c
index a476d9e54da325cb192dd49737f0e9143710a95c..7d169ff94d55d1c465e432c17f4ada1a042e3152 100644 (file)
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2003-2007 Imendio AB
  * Copyright (C) 2007-2008 Collabora Ltd.
@@ -15,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Richard Hult <richard@imendio.com>
  *          Martyn Russell <martyn@imendio.com>
 #include <glib/gi18n-lib.h>
 
 #include <libxml/uri.h>
+
+#include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/dbus.h>
+#include <telepathy-glib/util.h>
 
 #include "empathy-utils.h"
-#include "empathy-contact-factory.h"
 #include "empathy-contact-manager.h"
 #include "empathy-dispatcher.h"
 #include "empathy-dispatch-operation.h"
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
+/* Translation between presence types and string */
+static struct {
+       gchar *name;
+       TpConnectionPresenceType type;
+} presence_types[] = {
+       { "available", TP_CONNECTION_PRESENCE_TYPE_AVAILABLE },
+       { "busy",      TP_CONNECTION_PRESENCE_TYPE_BUSY },
+       { "away",      TP_CONNECTION_PRESENCE_TYPE_AWAY },
+       { "ext_away",  TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY },
+       { "hidden",    TP_CONNECTION_PRESENCE_TYPE_HIDDEN },
+       { "offline",   TP_CONNECTION_PRESENCE_TYPE_OFFLINE },
+       { "unset",     TP_CONNECTION_PRESENCE_TYPE_UNSET },
+       { "unknown",   TP_CONNECTION_PRESENCE_TYPE_UNKNOWN },
+       { "error",     TP_CONNECTION_PRESENCE_TYPE_ERROR },
+       /* alternative names */
+       { "dnd",      TP_CONNECTION_PRESENCE_TYPE_BUSY },
+       { "brb",      TP_CONNECTION_PRESENCE_TYPE_AWAY },
+       { "xa",       TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY },
+       { NULL, },
+};
+
+
 
 void
 empathy_init (void)
@@ -113,7 +136,8 @@ gboolean
 empathy_xml_validate (xmlDoc      *doc,
                     const gchar *dtd_filename)
 {
-       gchar        *path, *escaped;
+       gchar        *path;
+       xmlChar      *escaped;
        xmlValidCtxt  cvp;
        xmlDtd       *dtd;
        gboolean      ret;
@@ -127,7 +151,8 @@ empathy_xml_validate (xmlDoc      *doc,
        DEBUG ("Loading dtd file %s", path);
 
        /* The list of valid chars is taken from libxml. */
-       escaped = xmlURIEscapeStr (path, ":@&=+$,/?;");
+       escaped = xmlURIEscapeStr ((const xmlChar *) path,
+               (const xmlChar *)":@&=+$,/?;");
        g_free (path);
 
        memset (&cvp, 0, sizeof (cvp));
@@ -141,7 +166,7 @@ empathy_xml_validate (xmlDoc      *doc,
 }
 
 xmlNodePtr
-empathy_xml_node_get_child (xmlNodePtr   node, 
+empathy_xml_node_get_child (xmlNodePtr   node,
                           const gchar *child_name)
 {
        xmlNodePtr l;
@@ -150,7 +175,7 @@ empathy_xml_node_get_child (xmlNodePtr   node,
         g_return_val_if_fail (child_name != NULL, NULL);
 
        for (l = node->children; l; l = l->next) {
-               if (l->name && strcmp (l->name, child_name) == 0) {
+               if (l->name && strcmp ((const gchar *) l->name, child_name) == 0) {
                        return l;
                }
        }
@@ -159,7 +184,7 @@ empathy_xml_node_get_child (xmlNodePtr   node,
 }
 
 xmlChar *
-empathy_xml_node_get_child_content (xmlNodePtr   node, 
+empathy_xml_node_get_child_content (xmlNodePtr   node,
                                   const gchar *child_name)
 {
        xmlNodePtr l;
@@ -171,12 +196,12 @@ empathy_xml_node_get_child_content (xmlNodePtr   node,
        if (l) {
                return xmlNodeGetContent (l);
        }
-               
+
        return NULL;
 }
 
 xmlNodePtr
-empathy_xml_node_find_child_prop_value (xmlNodePtr   node, 
+empathy_xml_node_find_child_prop_value (xmlNodePtr   node,
                                       const gchar *prop_name,
                                       const gchar *prop_value)
 {
@@ -190,128 +215,104 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr   node,
        for (l = node->children; l && !found; l = l->next) {
                xmlChar *prop;
 
-               if (!xmlHasProp (l, prop_name)) {
+               if (!xmlHasProp (l, (const xmlChar *) prop_name)) {
                        continue;
                }
 
-               prop = xmlGetProp (l, prop_name);
-               if (prop && strcmp (prop, prop_value) == 0) {
+               prop = xmlGetProp (l, (const xmlChar *) prop_name);
+               if (prop && strcmp ((const gchar *) prop, prop_value) == 0) {
                        found = l;
                }
-               
-               xmlFree (prop);
-       }
-               
-       return found;
-}
 
-guint
-empathy_account_hash (gconstpointer key)
-{
-       g_return_val_if_fail (MC_IS_ACCOUNT (key), 0);
-
-       return g_str_hash (mc_account_get_unique_name (MC_ACCOUNT (key)));
-}
-
-gboolean
-empathy_account_equal (gconstpointer a,
-                      gconstpointer b)
-{
-       const gchar *name_a;
-       const gchar *name_b;
-
-       g_return_val_if_fail (MC_IS_ACCOUNT (a), FALSE);
-       g_return_val_if_fail (MC_IS_ACCOUNT (b), FALSE);
-
-       name_a = mc_account_get_unique_name (MC_ACCOUNT (a));
-       name_b = mc_account_get_unique_name (MC_ACCOUNT (b));
-
-       return g_str_equal (name_a, name_b);
-}
-
-MissionControl *
-empathy_mission_control_dup_singleton (void)
-{
-       static MissionControl *mc = NULL;
-
-       if (!mc) {
-               mc = mission_control_new (tp_get_bus ());
-               g_object_add_weak_pointer (G_OBJECT (mc), (gpointer) &mc);
-       } else {
-               g_object_ref (mc);
+               xmlFree (prop);
        }
 
-       return mc;
+       return found;
 }
 
 const gchar *
-empathy_presence_get_default_message (McPresence presence)
+empathy_presence_get_default_message (TpConnectionPresenceType presence)
 {
        switch (presence) {
-       case MC_PRESENCE_AVAILABLE:
+       case TP_CONNECTION_PRESENCE_TYPE_AVAILABLE:
                return _("Available");
-       case MC_PRESENCE_DO_NOT_DISTURB:
+       case TP_CONNECTION_PRESENCE_TYPE_BUSY:
                return _("Busy");
-       case MC_PRESENCE_AWAY:
-       case MC_PRESENCE_EXTENDED_AWAY:
+       case TP_CONNECTION_PRESENCE_TYPE_AWAY:
+       case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
                return _("Away");
-       case MC_PRESENCE_HIDDEN:
-               return _("Hidden");
-       case MC_PRESENCE_OFFLINE:
-       case MC_PRESENCE_UNSET:
+       case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
+               return _("Invisible");
+       case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
                return _("Offline");
-       default:
-               g_assert_not_reached ();
+       case TP_CONNECTION_PRESENCE_TYPE_UNSET:
+       case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
+       case TP_CONNECTION_PRESENCE_TYPE_ERROR:
+               return NULL;
        }
 
        return NULL;
 }
 
 const gchar *
-empathy_presence_to_str (McPresence presence)
+empathy_presence_to_str (TpConnectionPresenceType presence)
 {
-       switch (presence) {
-       case MC_PRESENCE_AVAILABLE:
-               return "available";
-       case MC_PRESENCE_DO_NOT_DISTURB:
-               return "busy";
-       case MC_PRESENCE_AWAY:
-               return "away";
-       case MC_PRESENCE_EXTENDED_AWAY:
-               return "ext_away";
-       case MC_PRESENCE_HIDDEN:
-               return "hidden";
-       case MC_PRESENCE_OFFLINE:
-               return "offline";
-       case MC_PRESENCE_UNSET:
-               return "unset";
-       default:
-               g_assert_not_reached ();
-       }
+       int i;
+
+       for (i = 0 ; presence_types[i].name != NULL; i++)
+               if (presence == presence_types[i].type)
+                       return presence_types[i].name;
 
        return NULL;
 }
 
-McPresence
+TpConnectionPresenceType
 empathy_presence_from_str (const gchar *str)
 {
-       if (strcmp (str, "available") == 0) {
-               return MC_PRESENCE_AVAILABLE;
-       } else if ((strcmp (str, "dnd") == 0) || (strcmp (str, "busy") == 0)) {
-               return MC_PRESENCE_DO_NOT_DISTURB;
-       } else if ((strcmp (str, "away") == 0) || (strcmp (str, "brb") == 0)) {
-               return MC_PRESENCE_AWAY;
-       } else if ((strcmp (str, "xa") == 0) || (strcmp (str, "ext_away") == 0)) {
-               return MC_PRESENCE_EXTENDED_AWAY;
-       } else if (strcmp (str, "hidden") == 0) {
-               return MC_PRESENCE_HIDDEN;
-       } else if (strcmp (str, "offline") == 0) {
-               return MC_PRESENCE_OFFLINE;
-       } else if (strcmp (str, "unset") == 0) {
-               return MC_PRESENCE_UNSET;
-       }
+       int i;
+
+       for (i = 0 ; presence_types[i].name != NULL; i++)
+               if (!tp_strdiff (str, presence_types[i].name))
+                       return presence_types[i].type;
+
+       return TP_CONNECTION_PRESENCE_TYPE_UNSET;
+}
 
-       return MC_PRESENCE_UNSET;
+const gchar *
+empathy_status_reason_get_default_message (TpConnectionStatusReason reason)
+{
+       switch (reason) {
+       case TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED:
+               return _("No reason specified");
+       case TP_CONNECTION_STATUS_REASON_REQUESTED:
+               return _("Status is set to offline");
+       case TP_CONNECTION_STATUS_REASON_NETWORK_ERROR:
+               return _("Network error");
+       case TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED:
+               return _("Authentication failed");
+       case TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR:
+               return _("Encryption error");
+       case TP_CONNECTION_STATUS_REASON_NAME_IN_USE:
+               return _("Name in use");
+       case TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED:
+               return _("Certificate not provided");
+       case TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED:
+               return _("Certificate untrusted");
+       case TP_CONNECTION_STATUS_REASON_CERT_EXPIRED:
+               return _("Certificate expired");
+       case TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED:
+               return _("Certificate not activated");
+       case TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH:
+               return _("Certificate hostname mismatch");
+       case TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH:
+               return _("Certificate fingerprint mismatch");
+       case TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED:
+               return _("Certificate self-signed");
+       case TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR:
+               return _("Certificate error");
+       default:
+               return _("Unknown reason");
+       }
 }
 
 gchar *
@@ -332,141 +333,313 @@ empathy_file_lookup (const gchar *filename, const gchar *subdir)
        return path;
 }
 
-typedef struct {
-       EmpathyRunUntilReadyFunc  func;
-       gpointer                  user_data;
-       GObject                  *object;
-       GMainLoop                *loop;
-} RunUntilReadyData;
-
-static void
-run_until_ready_cb (RunUntilReadyData *data)
+guint
+empathy_proxy_hash (gconstpointer key)
 {
-       if (!data->func || data->func (data->object, data->user_data)) {
-               DEBUG ("Object %p is ready", data->object);
-               g_main_loop_quit (data->loop);
-       }
+       TpProxy      *proxy = TP_PROXY (key);
+       TpProxyClass *proxy_class = TP_PROXY_GET_CLASS (key);
+
+       g_return_val_if_fail (TP_IS_PROXY (proxy), 0);
+       g_return_val_if_fail (proxy_class->must_have_unique_name, 0);
+
+       return g_str_hash (proxy->object_path) ^ g_str_hash (proxy->bus_name);
 }
 
-static gboolean
-object_is_ready (GObject *object,
-                gpointer user_data)
+gboolean
+empathy_proxy_equal (gconstpointer a,
+                    gconstpointer b)
 {
-       gboolean ready;
+       TpProxy *proxy_a = TP_PROXY (a);
+       TpProxy *proxy_b = TP_PROXY (b);
+       TpProxyClass *proxy_a_class = TP_PROXY_GET_CLASS (a);
+       TpProxyClass *proxy_b_class = TP_PROXY_GET_CLASS (b);
 
-       g_object_get (object, "ready", &ready, NULL);
+       g_return_val_if_fail (TP_IS_PROXY (proxy_a), FALSE);
+       g_return_val_if_fail (TP_IS_PROXY (proxy_b), FALSE);
+       g_return_val_if_fail (proxy_a_class->must_have_unique_name, 0);
+       g_return_val_if_fail (proxy_b_class->must_have_unique_name, 0);
 
-       return ready;
+       return g_str_equal (proxy_a->object_path, proxy_b->object_path) &&
+              g_str_equal (proxy_a->bus_name, proxy_b->bus_name);
 }
 
-void
-empathy_run_until_ready_full (gpointer                  object,
-                             const gchar              *signal,
-                             EmpathyRunUntilReadyFunc  func,
-                             gpointer                  user_data,
-                             GMainLoop               **loop)
+gboolean
+empathy_check_available_state (void)
 {
-       RunUntilReadyData  data;
-       gulong             signal_id;
+       TpConnectionPresenceType presence;
+       EmpathyIdle *idle;
 
-       g_return_if_fail (G_IS_OBJECT (object));
-       g_return_if_fail (signal != NULL);
+       idle = empathy_idle_dup_singleton ();
+       presence = empathy_idle_get_state (idle);
+       g_object_unref (idle);
 
-       if (func && func (object, user_data)) {
-               return;
+       if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
+               presence != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+               return FALSE;
        }
 
-       DEBUG ("Starting run until ready for object %p", object);
+       return TRUE;
+}
 
-       data.func = func;
-       data.user_data = user_data;
-       data.object = object;
-       data.loop = g_main_loop_new (NULL, FALSE);
+gint
+empathy_uint_compare (gconstpointer a,
+                     gconstpointer b)
+{
+       return *(guint *) a - *(guint *) b;
+}
 
-       signal_id = g_signal_connect_swapped (object, signal,
-                                             G_CALLBACK (run_until_ready_cb),
-                                             &data);
-       if (loop != NULL) {
-               *loop = data.loop;
-       }
+gchar *
+empathy_protocol_icon_name (const gchar *protocol)
+{
+  if (!tp_strdiff (protocol, "yahoojp"))
+    /* Yahoo Japan uses the same icon as Yahoo */
+    protocol = "yahoo";
+  else if (!tp_strdiff (protocol, "simple"))
+    /* SIMPLE uses the same icon as SIP */
+    protocol = "sip";
+  else if (!tp_strdiff (protocol, "sms"))
+    return g_strdup ("phone");
+
+  return g_strdup_printf ("im-%s", protocol);
+}
 
-       g_main_loop_run (data.loop);
+GType
+empathy_type_dbus_ao (void)
+{
+  static GType t = 0;
 
-       if (loop != NULL) {
-               *loop = NULL;
-       }
+  if (G_UNLIKELY (t == 0))
+     t = dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH);
 
-       g_signal_handler_disconnect (object, signal_id);
-       g_main_loop_unref (data.loop);
+  return t;
 }
 
-void
-empathy_run_until_ready (gpointer object)
+const char *
+empathy_protocol_name_to_display_name (const gchar *proto_name)
 {
-       empathy_run_until_ready_full (object, "notify::ready", object_is_ready,
-                                     NULL, NULL);
+  int i;
+  static struct {
+    const gchar *proto;
+    const gchar *display;
+    gboolean translated;
+  } names[] = {
+    { "jabber", "Jabber", FALSE },
+    { "gtalk", "Google Talk", FALSE },
+    { "msn", "MSN", FALSE, },
+    { "local-xmpp", N_("People Nearby"), TRUE },
+    { "irc", "IRC", FALSE },
+    { "icq", "ICQ", FALSE },
+    { "aim", "AIM", FALSE },
+    { "yahoo", "Yahoo!", FALSE },
+    { "yahoojp", N_("Yahoo! Japan"), TRUE },
+    { "facebook", N_("Facebook Chat"), TRUE },
+    { "groupwise", "GroupWise", FALSE },
+    { "sip", "SIP", FALSE },
+    { NULL, NULL }
+  };
+
+  for (i = 0; names[i].proto != NULL; i++)
+    {
+      if (!tp_strdiff (proto_name, names[i].proto))
+        {
+          if (names[i].translated)
+            return _(names[i].display);
+          else
+            return names[i].display;
+        }
+    }
+
+  return NULL;
 }
 
-McAccount *
-empathy_channel_get_account (TpChannel *channel)
+typedef struct {
+    GObject *instance;
+    GObject *user_data;
+    gulong handler_id;
+} WeakHandlerCtx;
+
+static WeakHandlerCtx *
+whc_new (GObject *instance,
+         GObject *user_data)
 {
-       TpConnection   *connection;
-       McAccount      *account;
-       MissionControl *mc;
+  WeakHandlerCtx *ctx = g_slice_new0 (WeakHandlerCtx);
 
-       g_object_get (channel, "connection", &connection, NULL);
-       mc = empathy_mission_control_dup_singleton ();
-       account = mission_control_get_account_for_tpconnection (mc, connection, NULL);
-       g_object_unref (connection);
-       g_object_unref (mc);
+  ctx->instance = instance;
+  ctx->user_data = user_data;
 
-       return account;
+  return ctx;
 }
 
-guint
-empathy_proxy_hash (gconstpointer key)
+static void
+whc_free (WeakHandlerCtx *ctx)
 {
-       TpProxy      *proxy = TP_PROXY (key);
-       TpProxyClass *proxy_class = TP_PROXY_GET_CLASS (key);
+  g_slice_free (WeakHandlerCtx, ctx);
+}
 
-       g_return_val_if_fail (TP_IS_PROXY (proxy), 0);
-       g_return_val_if_fail (proxy_class->must_have_unique_name, 0);
+static void user_data_destroyed_cb (gpointer, GObject *);
 
-       return g_str_hash (proxy->object_path) ^ g_str_hash (proxy->bus_name);
+static void
+instance_destroyed_cb (gpointer ctx_,
+                       GObject *where_the_instance_was)
+{
+  WeakHandlerCtx *ctx = ctx_;
+
+  DEBUG ("instance for %p destroyed; cleaning up", ctx);
+
+  /* No need to disconnect the signal here, the instance has gone away. */
+  g_object_weak_unref (ctx->user_data, user_data_destroyed_cb, ctx);
+  whc_free (ctx);
 }
 
-gboolean
-empathy_proxy_equal (gconstpointer a,
-                    gconstpointer b)
+static void
+user_data_destroyed_cb (gpointer ctx_,
+                        GObject *where_the_user_data_was)
 {
-       TpProxy *proxy_a = TP_PROXY (a);
-       TpProxy *proxy_b = TP_PROXY (b);
-       TpProxyClass *proxy_a_class = TP_PROXY_GET_CLASS (a);
-       TpProxyClass *proxy_b_class = TP_PROXY_GET_CLASS (b);
+  WeakHandlerCtx *ctx = ctx_;
 
-       g_return_val_if_fail (TP_IS_PROXY (proxy_a), FALSE);
-       g_return_val_if_fail (TP_IS_PROXY (proxy_b), FALSE);
-       g_return_val_if_fail (proxy_a_class->must_have_unique_name, 0);
-       g_return_val_if_fail (proxy_b_class->must_have_unique_name, 0);
+  DEBUG ("user_data for %p destroyed; disconnecting", ctx);
 
-       return g_str_equal (proxy_a->object_path, proxy_b->object_path) &&
-              g_str_equal (proxy_a->bus_name, proxy_b->bus_name);
+  g_signal_handler_disconnect (ctx->instance, ctx->handler_id);
+  g_object_weak_unref (ctx->instance, instance_destroyed_cb, ctx);
+  whc_free (ctx);
+}
+
+/* This function is copied from telepathy-gabble: util.c */
+/**
+ * empathy_signal_connect_weak:
+ * @instance: the instance to connect to.
+ * @detailed_signal: a string of the form "signal-name::detail".
+ * @c_handler: the GCallback to connect.
+ * @user_data: an object to pass as data to c_handler calls.
+ *
+ * Connects a #GCallback function to a signal for a particular object, as if
+ * with g_signal_connect(). Additionally, arranges for the signal handler to be
+ * disconnected if @user_data is destroyed.
+ *
+ * This is intended to be a convenient way for objects to use themselves as
+ * user_data for callbacks without having to explicitly disconnect all the
+ * handlers in their finalizers.
+ */
+void
+empathy_signal_connect_weak (gpointer instance,
+    const gchar *detailed_signal,
+    GCallback c_handler,
+    GObject *user_data)
+{
+  GObject *instance_obj = G_OBJECT (instance);
+  WeakHandlerCtx *ctx = whc_new (instance_obj, user_data);
+
+  DEBUG ("connecting to %p:%s with context %p", instance, detailed_signal, ctx);
+
+  ctx->handler_id = g_signal_connect (instance, detailed_signal, c_handler,
+      user_data);
+
+  g_object_weak_ref (instance_obj, instance_destroyed_cb, ctx);
+  g_object_weak_ref (user_data, user_data_destroyed_cb, ctx);
+}
+
+/* Note: this function depends on the account manager having its core feature
+ * prepared. */
+TpAccount *
+empathy_get_account_for_connection (TpConnection *connection)
+{
+  TpAccountManager *manager;
+  TpAccount *account = NULL;
+  GList *accounts, *l;
+
+  manager = tp_account_manager_dup ();
+
+  accounts = tp_account_manager_get_valid_accounts (manager);
+
+  for (l = accounts; l != NULL; l = l->next)
+    {
+      TpAccount *a = l->data;
+
+      if (tp_account_get_connection (a) == connection)
+        {
+          account = a;
+          break;
+        }
+    }
+
+  g_list_free (accounts);
+  g_object_unref (manager);
+
+  return account;
 }
 
 gboolean
-empathy_check_available_state (void)
+empathy_account_manager_get_accounts_connected (gboolean *connecting)
 {
-       McPresence presence;
-       EmpathyIdle *idle;
+  TpAccountManager *manager;
+  GList *accounts, *l;
+  gboolean out_connecting = FALSE;
+  gboolean out_connected = FALSE;
 
-       idle = empathy_idle_dup_singleton ();
-       presence = empathy_idle_get_state (idle);
-       g_object_unref (idle);
+  manager = tp_account_manager_dup ();
 
-       if (presence != MC_PRESENCE_AVAILABLE &&
-               presence != MC_PRESENCE_UNSET) {
-               return FALSE;    
-       }
+  if (G_UNLIKELY (!tp_account_manager_is_prepared (manager,
+          TP_ACCOUNT_MANAGER_FEATURE_CORE)))
+    g_critical (G_STRLOC ": %s called before AccountManager ready", G_STRFUNC);
 
-       return TRUE;
+  accounts = tp_account_manager_get_valid_accounts (manager);
+
+  for (l = accounts; l != NULL; l = l->next)
+    {
+      TpConnectionStatus s = tp_account_get_connection_status (
+          TP_ACCOUNT (l->data), NULL);
+
+      if (s == TP_CONNECTION_STATUS_CONNECTING)
+        out_connecting = TRUE;
+      else if (s == TP_CONNECTION_STATUS_CONNECTED)
+        out_connected = TRUE;
+
+      if (out_connecting && out_connected)
+        break;
+    }
+
+  g_list_free (accounts);
+  g_object_unref (manager);
+
+  if (connecting != NULL)
+    *connecting = out_connecting;
+
+  return out_connected;
+}
+
+/* Change the RequestedPresence of a newly created account to ensure that it
+ * is actually connected. */
+void
+empathy_connect_new_account (TpAccount *account,
+    TpAccountManager *account_manager)
+{
+  TpConnectionPresenceType presence;
+  gchar *status, *message;
+
+  /* only force presence if presence was offline, unknown or unset */
+  presence = tp_account_get_requested_presence (account, NULL, NULL);
+  switch (presence)
+    {
+      case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
+      case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
+      case TP_CONNECTION_PRESENCE_TYPE_UNSET:
+        presence = tp_account_manager_get_most_available_presence (
+            account_manager, &status, &message);
+
+        if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
+          /* Global presence is offline; we force it so user doesn't have to
+           * manually change the presence to connect his new account. */
+          presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
+
+        tp_account_request_presence_async (account, presence,
+            status, NULL, NULL, NULL);
+
+        g_free (status);
+        g_free (message);
+        break;
+
+       default:
+        /* do nothing if the presence is not offline */
+        break;
+    }
 }