local-xmpp-assistant-widget: increase row-spacing

[empathy.git] / libempathy / empathy-tp-roomlist.c

diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index 54d2323398af1b4bfb722c99b96a4eb87d7332c5..93e28d3d3b150a48b8a48151e33c55bb9241190c 100644 (file)
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -28,8 +28,6 @@
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/interfaces.h>
 
-#include "empathy-account.h"
-
 #include "empathy-tp-roomlist.h"
 #include "empathy-chatroom.h"
 #include "empathy-utils.h"
@@ -41,7 +39,7 @@
 typedef struct {
        TpConnection *connection;
        TpChannel    *channel;
-       EmpathyAccount    *account;
+       TpAccount    *account;
        gboolean      is_listing;
        gboolean      start_requested;
 } EmpathyTpRoomlistPriv;
@@ -205,7 +203,7 @@ tp_roomlist_got_rooms_cb (TpChannel       *channel,
                                                       chatrooms,
                                                       tp_roomlist_chatrooms_free,
                                                       list);
-               g_array_free (handles, TRUE);
+               g_array_unref (handles);
        }
 }
 
@@ -263,65 +261,50 @@ stop_listing_cb (TpChannel *proxy,
 }
 
 static void
-channel_ready_cb (TpChannel *channel,
-                 const GError *error,
-                 gpointer user_data)
+tp_roomlist_create_channel_cb (GObject *source,
+                               GAsyncResult *result,
+                               gpointer      user_data)
 {
-       EmpathyTpRoomlist *list = EMPATHY_TP_ROOMLIST (user_data);
-       EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
+       EmpathyTpRoomlist *self = user_data;
+       EmpathyTpRoomlistPriv *priv = GET_PRIV (self);
+       GError *error = NULL;
 
-       if (error != NULL) {
-               DEBUG ("Channel invalidated: %s", error->message);
-               g_signal_emit (list, signals[DESTROY], 0);
-               return;
+       priv->channel = tp_account_channel_request_create_and_handle_channel_finish (
+               TP_ACCOUNT_CHANNEL_REQUEST (source), result, NULL, &error);
+
+       if (priv->channel == NULL) {
+               DEBUG ("Error creating channel: %s", error->message);
+               g_error_free (error);
+               goto out;
        }
 
        g_signal_connect (priv->channel, "invalidated",
-                         G_CALLBACK (tp_roomlist_invalidated_cb),
-                         list);
+                         G_CALLBACK (tp_roomlist_invalidated_cb), self);
 
        tp_cli_channel_type_room_list_connect_to_listing_rooms (priv->channel,
                                                                tp_roomlist_listing_cb,
                                                                NULL, NULL,
-                                                               G_OBJECT (list),
+                                                               G_OBJECT (self),
                                                                NULL);
        tp_cli_channel_type_room_list_connect_to_got_rooms (priv->channel,
                                                            tp_roomlist_got_rooms_cb,
                                                            NULL, NULL,
-                                                           G_OBJECT (list),
+                                                           G_OBJECT (self),
                                                            NULL);
 
        tp_cli_channel_type_room_list_call_get_listing_rooms (priv->channel, -1,
                                                              tp_roomlist_get_listing_rooms_cb,
                                                              NULL, NULL,
-                                                             G_OBJECT (list));
+                                                             G_OBJECT (self));
 
        if (priv->start_requested == TRUE) {
                tp_cli_channel_type_room_list_call_list_rooms (priv->channel, -1,
-                       call_list_rooms_cb, list, NULL, NULL);
+                       call_list_rooms_cb, self, NULL, G_OBJECT (self));
                priv->start_requested = FALSE;
        }
-}
-
-static void
-tp_roomlist_request_channel_cb (TpConnection *connection,
-                               const gchar  *object_path,
-                               const GError *error,
-                               gpointer      user_data,
-                               GObject      *list)
-{
-       EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
-
-       if (error) {
-               DEBUG ("Error requesting channel: %s", error->message);
-               return;
-       }
 
-       priv->channel = tp_channel_new (priv->connection, object_path,
-                                       TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
-                                       TP_HANDLE_TYPE_NONE,
-                                       0, NULL);
-       tp_channel_call_when_ready (priv->channel, channel_ready_cb, list);
+out:
+       g_object_unref (self);
 }
 
 static void
@@ -353,18 +336,29 @@ static void
 tp_roomlist_constructed (GObject *list)
 {
        EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
+       GHashTable *request;
+       TpAccountChannelRequest *req;
+
+       request = tp_asv_new (
+               TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+                 TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+               TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
+               NULL);
 
-       priv->connection = empathy_account_get_connection (priv->account);
+       priv->connection = tp_account_get_connection (priv->account);
        g_object_ref (priv->connection);
 
-       tp_cli_connection_call_request_channel (priv->connection, -1,
-                                               TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
-                                               TP_HANDLE_TYPE_NONE,
-                                               0,
-                                               TRUE,
-                                               tp_roomlist_request_channel_cb,
-                                               NULL, NULL,
-                                               list);
+       req = tp_account_channel_request_new (priv->account, request,
+               TP_USER_ACTION_TIME_CURRENT_TIME);
+
+       /* Ensure we stay alive during the async call */
+       g_object_ref (list);
+
+       tp_account_channel_request_create_and_handle_channel_async (req, NULL,
+               tp_roomlist_create_channel_cb, list);
+
+       g_hash_table_unref (request);
+       g_object_unref (req);
 }
 
 static void
@@ -421,7 +415,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
                                         g_param_spec_object ("account",
                                                              "The Account",
                                                              "The account on which it lists rooms",
-                                                             EMPATHY_TYPE_ACCOUNT,
+                                                             TP_TYPE_ACCOUNT,
                                                              G_PARAM_READWRITE |
                                                              G_PARAM_CONSTRUCT_ONLY));
        g_object_class_install_property (object_class,
@@ -438,7 +432,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              1, EMPATHY_TYPE_CHATROOM);
 
@@ -448,7 +442,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              0);
 
@@ -458,7 +452,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
                              G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              1, G_TYPE_POINTER);
 
@@ -477,7 +471,7 @@ empathy_tp_roomlist_init (EmpathyTpRoomlist *list)
 }
 
 EmpathyTpRoomlist *
-empathy_tp_roomlist_new (EmpathyAccount *account)
+empathy_tp_roomlist_new (TpAccount *account)
 {
        EmpathyTpRoomlist *list;