]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-utils.c
Updated Basque language
[empathy.git] / libempathy / empathy-utils.c
index c80b75cceeb9622bfddbf1ded690b367b22bb4f1..243b4b040c1e34ba4b2cf6faf7699b7e255ba0c6 100644 (file)
  *
  * 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>
  *          Xavier Claessens <xclaesse@gmail.com>
- *          Jonny Lamb <jonny.lamb@collabora.co.uk>
  */
 
 #include "config.h"
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
-#include <regex.h>
 
-#include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libxml/uri.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/dbus.h>
-
-#include <extensions/extensions.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"
+#include "empathy-idle.h"
+#include "empathy-tp-call.h"
+
+#include <extensions/extensions.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-static void regex_init (void);
+/* 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, },
+};
 
-gchar *
-empathy_substring (const gchar *str,
-                 gint         start,
-                 gint         end)
-{
-       return g_strndup (str + start, end - start);
-}
 
-/*
- * Regular Expression code to match urls.
- */
-#define APTCHARS  "-A-Za-z0-9,-."
-#define USERCHARS "-A-Za-z0-9"
-#define PASSCHARS "-A-Za-z0-9,?;.:/!%$^*&~\"#'"
-#define HOSTCHARS "-A-Za-z0-9_"
-#define PATHCHARS "-A-Za-z0-9_$.+!*(),;:@&=?/~#%"
-#define SCHEME    "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)"
-#define USER      "[" USERCHARS "]+(:["PASSCHARS "]+)?"
-#define URLPATH   "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
-
-static regex_t dingus[EMPATHY_REGEX_ALL];
-
-static void
-regex_init (void)
-{
-       static gboolean  inited = FALSE;
-       const gchar     *expression;
-       gint             i;
 
-       if (inited) {
-               return;
-       }
-
-       for (i = 0; i < EMPATHY_REGEX_ALL; i++) {
-               switch (i) {
-               case EMPATHY_REGEX_AS_IS:
-                       expression =
-                               SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-                               "(:[0-9]+)?(" URLPATH ")?";
-                       break;
-               case EMPATHY_REGEX_BROWSER:
-                       expression =
-                               "(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-                               "(:[0-9]+)?(" URLPATH ")?";
-                       break;
-               case EMPATHY_REGEX_APT:
-                       expression =
-                               "apt://[" APTCHARS "]*";
-                       break;
-               case EMPATHY_REGEX_EMAIL:
-                       expression =
-                               "(mailto:)?[a-z0-9][a-z0-9._-]*@[a-z0-9]"
-                               "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+";
-                       break;
-               case EMPATHY_REGEX_OTHER:
-                       expression =
-                               "news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
-                               "@[" HOSTCHARS ".]+(:[0-9]+)?";
-                       break;
-               default:
-                       /* Silence the compiler. */
-                       expression = NULL;
-                       continue;
-               }
-
-               memset (&dingus[i], 0, sizeof (regex_t));
-               regcomp (&dingus[i], expression, REG_EXTENDED | REG_ICASE);
-       }
-
-       inited = TRUE;
-}
-
-gint
-empathy_regex_match (EmpathyRegExType  type,
-                   const gchar     *msg,
-                   GArray          *start,
-                   GArray          *end)
+void
+empathy_init (void)
 {
-       regmatch_t matches[1];
-       gint       ret = 0;
-       gint       num_matches = 0;
-       gint       offset = 0;
-       gint       i;
-
-       g_return_val_if_fail (type >= 0 || type <= EMPATHY_REGEX_ALL, 0);
-
-       regex_init ();
+       static gboolean initialized = FALSE;
 
-       while (!ret && type != EMPATHY_REGEX_ALL) {
-               ret = regexec (&dingus[type], msg + offset, 1, matches, 0);
-               if (ret == 0) {
-                       gint s;
+       if (initialized)
+               return;
 
-                       num_matches++;
+       g_type_init ();
 
-                       s = matches[0].rm_so + offset;
-                       offset = matches[0].rm_eo + offset;
+       /* Setup gettext */
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-                       g_array_append_val (start, s);
-                       g_array_append_val (end, offset);
-               }
+       /* Setup debug output for empathy and telepathy-glib */
+       if (g_getenv ("EMPATHY_TIMING") != NULL) {
+               g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
        }
+       empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
+       tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
 
-       if (type != EMPATHY_REGEX_ALL) {
-               DEBUG ("Found %d matches for regex type:%d", num_matches, type);
-               return num_matches;
-       }
-
-       /* If EMPATHY_REGEX_ALL then we run ALL regex's on the string. */
-       for (i = 0; i < EMPATHY_REGEX_ALL; i++, ret = 0) {
-               while (!ret) {
-                       ret = regexec (&dingus[i], msg + offset, 1, matches, 0);
-                       if (ret == 0) {
-                               gint s;
-
-                               num_matches++;
-
-                               s = matches[0].rm_so + offset;
-                               offset = matches[0].rm_eo + offset;
-
-                               g_array_append_val (start, s);
-                               g_array_append_val (end, offset);
-                       }
-               }
-       }
+       emp_cli_init ();
 
-       DEBUG ("Found %d matches for ALL regex types", num_matches);
+       initialized = TRUE;
+}
 
-       return num_matches;
+gchar *
+empathy_substring (const gchar *str,
+                 gint         start,
+                 gint         end)
+{
+       return g_strndup (str + start, end - start);
 }
 
 gint
@@ -238,7 +163,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;
@@ -256,7 +181,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;
@@ -268,12 +193,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)
 {
@@ -295,120 +220,59 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr   node,
                if (prop && strcmp (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_new (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:
+       case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
                return _("Hidden");
-       case MC_PRESENCE_OFFLINE:
-       case MC_PRESENCE_UNSET:
+       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 MC_PRESENCE_UNSET;
+       return TP_CONNECTION_PRESENCE_TYPE_UNSET;
 }
 
 gchar *
@@ -429,207 +293,6 @@ 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)
-{
-       if (!data->func || data->func (data->object, data->user_data)) {
-               DEBUG ("Object %p is ready", data->object);
-               g_main_loop_quit (data->loop);
-       }
-}
-
-static gboolean
-object_is_ready (GObject *object,
-                gpointer user_data)
-{
-       gboolean ready;
-
-       g_object_get (object, "ready", &ready, NULL);
-
-       return ready;
-}
-
-void
-empathy_run_until_ready_full (gpointer                  object,
-                             const gchar              *signal,
-                             EmpathyRunUntilReadyFunc  func,
-                             gpointer                  user_data,
-                             GMainLoop               **loop)
-{
-       RunUntilReadyData  data;
-       gulong             signal_id;
-
-       g_return_if_fail (G_IS_OBJECT (object));
-       g_return_if_fail (signal != NULL);
-
-       if (func && func (object, user_data)) {
-               return;
-       }
-
-       DEBUG ("Starting run until ready for object %p", object);
-
-       data.func = func;
-       data.user_data = user_data;
-       data.object = object;
-       data.loop = g_main_loop_new (NULL, FALSE);
-
-       signal_id = g_signal_connect_swapped (object, signal,
-                                             G_CALLBACK (run_until_ready_cb),
-                                             &data);
-       if (loop != NULL) {
-               *loop = data.loop;
-       }
-
-       g_main_loop_run (data.loop);
-
-       if (loop != NULL) {
-               *loop = NULL;
-       }
-
-       g_signal_handler_disconnect (object, signal_id);
-       g_main_loop_unref (data.loop);
-}
-
-void
-empathy_run_until_ready (gpointer object)
-{
-       empathy_run_until_ready_full (object, "notify::ready", object_is_ready,
-                                     NULL, NULL);
-}
-
-McAccount *
-empathy_channel_get_account (TpChannel *channel)
-{
-       TpConnection   *connection;
-       McAccount      *account;
-       MissionControl *mc;
-
-       g_object_get (channel, "connection", &connection, NULL);
-       mc = empathy_mission_control_new ();
-       account = mission_control_get_account_for_tpconnection (mc, connection, NULL);
-       g_object_unref (connection);
-       g_object_unref (mc);
-
-       return account;
-}
-
-typedef void (*AccountStatusChangedFunc) (MissionControl           *mc,
-                                         TpConnectionStatus        status,
-                                         McPresence                presence,
-                                         TpConnectionStatusReason  reason,
-                                         const gchar              *unique_name,
-                                         gpointer                  user_data);
-
-typedef struct {
-       AccountStatusChangedFunc handler;
-       gpointer                 user_data;
-       GClosureNotify           free_func;
-       MissionControl          *mc;
-} AccountStatusChangedData;
-
-typedef struct {
-       TpConnectionStatus        status;
-       McPresence                presence;
-       TpConnectionStatusReason  reason;
-       gchar                    *unique_name;
-       AccountStatusChangedData *data;
-} InvocationData;
-
-static void
-account_status_changed_data_free (gpointer ptr,
-                                 GClosure *closure)
-{
-       AccountStatusChangedData *data = ptr;
-
-       if (data->free_func) {
-               data->free_func (data->user_data, closure);
-       }
-       g_object_unref (data->mc);
-       g_slice_free (AccountStatusChangedData, data);
-}
-
-static gboolean
-account_status_changed_invoke_callback (gpointer data)
-{
-       InvocationData *invocation_data = data;
-
-       invocation_data->data->handler (invocation_data->data->mc,
-                                       invocation_data->status,
-                                       invocation_data->presence,
-                                       invocation_data->reason,
-                                       invocation_data->unique_name,
-                                       invocation_data->data->user_data);
-
-       g_free (invocation_data->unique_name);
-       g_slice_free (InvocationData, invocation_data);
-
-       return FALSE;
-}
-
-static void
-account_status_changed_cb (MissionControl           *mc,
-                          TpConnectionStatus        status,
-                          McPresence                presence,
-                          TpConnectionStatusReason  reason,
-                          const gchar              *unique_name,
-                          AccountStatusChangedData *data)
-{
-       InvocationData *invocation_data;
-
-       invocation_data = g_slice_new (InvocationData);
-       invocation_data->status = status;
-       invocation_data->presence = presence;
-       invocation_data->reason = reason;
-       invocation_data->unique_name = g_strdup (unique_name);
-       invocation_data->data = data;
-
-       g_idle_add_full (G_PRIORITY_HIGH,
-                        account_status_changed_invoke_callback,
-                        invocation_data, NULL);
-}
-
-gpointer
-empathy_connect_to_account_status_changed (MissionControl *mc,
-                                          GCallback       handler,
-                                          gpointer        user_data,
-                                          GClosureNotify  free_func)
-{
-       AccountStatusChangedData *data;
-
-       g_return_val_if_fail (IS_MISSIONCONTROL (mc), NULL);
-       g_return_val_if_fail (handler != NULL, NULL);
-       
-       data = g_slice_new (AccountStatusChangedData);
-       data->handler = (AccountStatusChangedFunc) handler;
-       data->user_data = user_data;
-       data->free_func = free_func;
-       data->mc = g_object_ref (mc);
-
-       dbus_g_proxy_connect_signal (DBUS_G_PROXY (mc), "AccountStatusChanged",
-                                    G_CALLBACK (account_status_changed_cb),
-                                    data, account_status_changed_data_free);
-
-       return data;
-}
-
-void
-empathy_disconnect_account_status_changed (gpointer token)
-{
-       AccountStatusChangedData *data = token;
-
-       dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (data->mc),
-                                       "AccountStatusChanged",
-                                       G_CALLBACK (account_status_changed_cb),
-                                       data);
-}
-
 guint
 empathy_proxy_hash (gconstpointer key)
 {
@@ -660,121 +323,83 @@ empathy_proxy_equal (gconstpointer a,
               g_str_equal (proxy_a->bus_name, proxy_b->bus_name);
 }
 
-typedef struct {
-       gint timeout_ms;
-       gchar *channel_type;
-       guint handle_type;
-       empathy_connection_callback_for_request_channel callback;
-       gpointer user_data;
-       GDestroyNotify destroy;
-       TpHandle handle;
-       gboolean suppress_handler;
-       guint ref_count;
-} ConnectionRequestChannelData;
-
-static void
-connection_request_channel_data_unref (gpointer user_data)
-{
-       ConnectionRequestChannelData *data = (ConnectionRequestChannelData*) user_data;
-
-       if (--data->ref_count == 0) {
-               g_free (data->channel_type);
-               if (data->destroy) {
-                       data->destroy (data->user_data);
-               }
-               g_slice_free (ConnectionRequestChannelData, data);
-       }
-}
-
-static void
-connection_request_channel_cb (TpConnection *connection,
-                              const gchar *object_path,
-                              const GError *error,
-                              gpointer user_data,
-                              GObject *weak_object)
+gboolean
+empathy_check_available_state (void)
 {
-       ConnectionRequestChannelData *data = (ConnectionRequestChannelData*) user_data;
-       TpChannel *channel;
+       TpConnectionPresenceType presence;
+       EmpathyIdle *idle;
 
-       if (!data->callback) {
-               return;
-       }
+       idle = empathy_idle_dup_singleton ();
+       presence = empathy_idle_get_state (idle);
+       g_object_unref (idle);
 
-       if (error) {
-               data->callback (connection, NULL, error, data->user_data, weak_object);
-               return;
+       if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
+               presence != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+               return FALSE;
        }
 
-       channel = tp_channel_new (connection, object_path,
-                                 data->channel_type,
-                                 data->handle_type,
-                                 data->handle, NULL);
-
-       data->callback (connection, channel, NULL, data->user_data, weak_object);
-       g_object_unref (channel);
+       return TRUE;
 }
 
-static void
-connection_request_handles_cb (TpConnection *connection,
-                              const GArray *handles,
-                              const GError *error,
-                              gpointer user_data,
-                              GObject *weak_object)
+gint
+empathy_uint_compare (gconstpointer a,
+                     gconstpointer b)
 {
-       ConnectionRequestChannelData *data = (ConnectionRequestChannelData*) user_data;
-
-       if (error) {
-               if (data->callback) {
-                       data->callback (connection, NULL, error, data->user_data, weak_object);
-               }
-               return;
-       }
-
-       data->handle = g_array_index (handles, guint, 0);
-       data->ref_count++;
-       tp_cli_connection_call_request_channel (connection, data->timeout_ms,
-                                               data->channel_type,
-                                               data->handle_type,
-                                               data->handle,
-                                               data->suppress_handler,
-                                               connection_request_channel_cb,
-                                               data,
-                                               (GDestroyNotify) connection_request_channel_data_unref,
-                                               weak_object);
+       return *(guint *) a - *(guint *) b;
 }
 
-void
-empathy_connection_request_channel (TpConnection *connection,
-                                   gint timeout_ms,
-                                   const gchar *channel_type,
-                                   guint handle_type,
-                                   const gchar *name,
-                                   gboolean suppress_handler,
-                                   empathy_connection_callback_for_request_channel callback,
-                                   gpointer user_data,
-                                   GDestroyNotify destroy,
-                                   GObject *weak_object)
-{
-       const gchar *names[] = {name, NULL};
-       ConnectionRequestChannelData *data;
-
-       data = g_slice_new (ConnectionRequestChannelData);
-       data->timeout_ms = timeout_ms;
-       data->channel_type = g_strdup (channel_type);
-       data->handle_type = handle_type;
-       data->callback = callback;
-       data->user_data = user_data;
-       data->destroy = destroy;
-       data->handle = 0;
-       data->suppress_handler = suppress_handler;
-       data->ref_count = 1;
-       tp_cli_connection_call_request_handles (connection,
-                                               timeout_ms,
-                                               handle_type,
-                                               names,
-                                               connection_request_handles_cb,
-                                               data,
-                                               (GDestroyNotify) connection_request_channel_data_unref,
-                                               weak_object);
+gchar *
+empathy_protocol_icon_name (const gchar *protocol)
+{
+  return g_strdup_printf ("im-%s", protocol);
+}
+
+GType
+empathy_type_dbus_ao (void)
+{
+  static GType t = 0;
+
+  if (G_UNLIKELY (t == 0))
+     t = dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH);
+
+  return t;
+}
+
+const char *
+empathy_protocol_name_to_display_name (const gchar *proto_name)
+{
+  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;
 }