From 875bf697d54f1c4ca98478ded849bc733828f758 Mon Sep 17 00:00:00 2001 From: Vitaly Minko Date: Fri, 12 Nov 2010 17:47:51 +0300 Subject: Make AccountChooser-related code simpler and clearer (re #633481). --- libempathy-gtk/empathy-new-message-dialog.c | 33 +++++------------------------ 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'libempathy-gtk/empathy-new-message-dialog.c') diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 8249b8693..4747dfbb9 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -90,40 +90,17 @@ conn_prepared_cb (GObject *conn, FilterCallbackData *data = user_data; GError *myerr = NULL; TpCapabilities *caps; - GPtrArray *classes; - guint i; if (!tp_proxy_prepare_finish (conn, result, &myerr)) - goto out; - - caps = tp_connection_get_capabilities (TP_CONNECTION (conn)); - classes = tp_capabilities_get_channel_classes (caps); - - for (i = 0; i < classes->len; i++) { - GHashTable *fixed; - GStrv allowed; - const gchar *chan_type; - - tp_value_array_unpack (g_ptr_array_index (classes, i), 2, - &fixed, &allowed); - - chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE); - - if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT)) - continue; - - if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != - TP_HANDLE_TYPE_CONTACT) - continue; - - data->callback (TRUE, data->user_data); + data->callback (FALSE, data->user_data); g_slice_free (FilterCallbackData, data); - return; } -out: - data->callback (FALSE, data->user_data); + caps = tp_connection_get_capabilities (TP_CONNECTION (conn)); + data->callback (tp_capabilities_supports_text_chats (caps), + data->user_data); + g_slice_free (FilterCallbackData, data); } -- cgit v1.2.3