Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

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

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index b11725f48e1eb23b77754896f45d596f30881ff3..5e166cac9d33163e74719e73ed99babab46d10e0 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -55,58 +55,58 @@ struct _EmpathyTpChatPriv {
        DBusGProxy            *chat_state_iface;
 };
 
-static void             empathy_tp_chat_class_init    (EmpathyTpChatClass        *klass);
-static void             empathy_tp_chat_init          (EmpathyTpChat             *chat);
-static void             tp_chat_finalize              (GObject                   *object);
-static GObject *        tp_chat_constructor           (GType                      type,
-                                                      guint                      n_props,
-                                                      GObjectConstructParam     *props);
-static void             tp_chat_get_property          (GObject                   *object,
-                                                      guint                      param_id,
-                                                      GValue                    *value,
-                                                      GParamSpec                *pspec);
-static void             tp_chat_set_property          (GObject                   *object,
-                                                      guint                      param_id,
-                                                      const GValue              *value,
-                                                      GParamSpec                *pspec);
-static void             tp_chat_destroy_cb            (TpChan                    *text_chan,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_closed_cb             (TpChan                    *text_chan,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_received_cb           (DBusGProxy                *text_iface,
-                                                      guint                      message_id,
-                                                      guint                      timestamp,
-                                                      guint                      from_handle,
-                                                      guint                      message_type,
-                                                      guint                      message_flags,
-                                                      gchar                     *message_body,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_sent_cb               (DBusGProxy                *text_iface,
-                                                      guint                      timestamp,
-                                                      guint                      message_type,
-                                                      gchar                     *message_body,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_send_error_cb         (DBusGProxy                *text_iface,
-                                                      guint                      error_code,
-                                                      guint                      timestamp,
-                                                      guint                      message_type,
-                                                      gchar                     *message_body,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_state_changed_cb      (DBusGProxy                *chat_state_iface,
-                                                      guint                      handle,
-                                                      TelepathyChannelChatState  state,
-                                                      EmpathyTpChat             *chat);
-static EmpathyMessage * tp_chat_build_message         (EmpathyTpChat             *chat,
-                                                      guint                      type,
-                                                      guint                      timestamp,
-                                                      guint                      from_handle,
-                                                      const gchar               *message_body);
-static void             tp_chat_properties_ready_cb   (TpPropsIface              *props_iface,
-                                                      EmpathyTpChat             *chat);
-static void             tp_chat_properties_changed_cb (TpPropsIface              *props_iface,
-                                                      guint                      prop_id,
-                                                      TpPropsChanged             flag,
-                                                      EmpathyTpChat             *chat);
+static void             empathy_tp_chat_class_init    (EmpathyTpChatClass    *klass);
+static void             empathy_tp_chat_init          (EmpathyTpChat         *chat);
+static void             tp_chat_finalize              (GObject               *object);
+static GObject *        tp_chat_constructor           (GType                  type,
+                                                      guint                  n_props,
+                                                      GObjectConstructParam *props);
+static void             tp_chat_get_property          (GObject               *object,
+                                                      guint                  param_id,
+                                                      GValue                *value,
+                                                      GParamSpec            *pspec);
+static void             tp_chat_set_property          (GObject               *object,
+                                                      guint                  param_id,
+                                                      const GValue          *value,
+                                                      GParamSpec            *pspec);
+static void             tp_chat_destroy_cb            (TpChan                *text_chan,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_closed_cb             (TpChan                *text_chan,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_received_cb           (DBusGProxy            *text_iface,
+                                                      guint                  message_id,
+                                                      guint                  timestamp,
+                                                      guint                  from_handle,
+                                                      guint                  message_type,
+                                                      guint                  message_flags,
+                                                      gchar                 *message_body,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_sent_cb               (DBusGProxy            *text_iface,
+                                                      guint                  timestamp,
+                                                      guint                  message_type,
+                                                      gchar                 *message_body,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_send_error_cb         (DBusGProxy            *text_iface,
+                                                      guint                  error_code,
+                                                      guint                  timestamp,
+                                                      guint                  message_type,
+                                                      gchar                 *message_body,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_state_changed_cb      (DBusGProxy            *chat_state_iface,
+                                                      guint                  handle,
+                                                      TpChannelChatState     state,
+                                                      EmpathyTpChat         *chat);
+static EmpathyMessage * tp_chat_build_message         (EmpathyTpChat         *chat,
+                                                      guint                  type,
+                                                      guint                  timestamp,
+                                                      guint                  from_handle,
+                                                      const gchar           *message_body);
+static void             tp_chat_properties_ready_cb   (TpPropsIface          *props_iface,
+                                                      EmpathyTpChat         *chat);
+static void             tp_chat_properties_changed_cb (TpPropsIface          *props_iface,
+                                                      guint                  prop_id,
+                                                      TpPropsChanged         flag,
+                                                      EmpathyTpChat         *chat);
 enum {
        PROP_0,
        PROP_ACCOUNT,
@@ -302,7 +302,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             empathy_marshal_VOID__OBJECT_UINT,
+                             _empathy_marshal_VOID__OBJECT_UINT,
                              G_TYPE_NONE,
                              2, EMPATHY_TYPE_MESSAGE, G_TYPE_UINT);
 
@@ -312,7 +312,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             empathy_marshal_VOID__OBJECT_UINT,
+                             _empathy_marshal_VOID__OBJECT_UINT,
                              G_TYPE_NONE,
                              2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
 
@@ -416,11 +416,11 @@ tp_chat_constructor (GType                  type,
        priv->mc = empathy_mission_control_new ();
 
        priv->text_iface = tp_chan_get_interface (priv->tp_chan,
-                                                 TELEPATHY_CHAN_IFACE_TEXT_QUARK);
+                                                 TP_IFACE_QUARK_CHANNEL_TYPE_TEXT);
        priv->chat_state_iface = tp_chan_get_interface (priv->tp_chan,
-                                                       TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK);
+                                                       TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE);
        priv->props_iface = tp_chan_get_interface (priv->tp_chan,
-                                                  TELEPATHY_PROPS_IFACE_QUARK);
+                                                  TP_IFACE_QUARK_PROPERTIES_INTERFACE);
 
        g_signal_connect (priv->tp_chan, "destroy",
                          G_CALLBACK (tp_chat_destroy_cb),
@@ -578,7 +578,7 @@ empathy_tp_chat_new_with_contact (EmpathyContact *contact)
        account = empathy_contact_get_account (contact);
 
        if (mission_control_get_connection_status (mc, account, NULL) != 0) {
-               /* The account is not connected, nothing to do. */
+               /* The account is not connected. */
                return NULL;
        }
 
@@ -642,6 +642,18 @@ empathy_tp_chat_get_channel (EmpathyTpChat *chat)
        return priv->tp_chan;
 }
 
+McAccount *
+empathy_tp_chat_get_account (EmpathyTpChat *chat)
+{
+       EmpathyTpChatPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
+
+       priv = GET_PRIV (chat);
+
+       return priv->account;
+}
+
 GList *
 empathy_tp_chat_get_pendings (EmpathyTpChat *chat)
 {
@@ -736,8 +748,8 @@ empathy_tp_chat_send (EmpathyTpChat *chat,
 }
 
 void
-empathy_tp_chat_set_state (EmpathyTpChat             *chat,
-                          TelepathyChannelChatState  state)
+empathy_tp_chat_set_state (EmpathyTpChat      *chat,
+                          TpChannelChatState  state)
 {
        EmpathyTpChatPriv *priv;
        GError            *error = NULL;
@@ -891,10 +903,10 @@ tp_chat_send_error_cb (DBusGProxy    *text_iface,
 }
 
 static void
-tp_chat_state_changed_cb (DBusGProxy                *chat_state_iface,
-                         guint                      handle,
-                         TelepathyChannelChatState  state,
-                         EmpathyTpChat             *chat)
+tp_chat_state_changed_cb (DBusGProxy         *chat_state_iface,
+                         guint               handle,
+                         TpChannelChatState  state,
+                         EmpathyTpChat      *chat)
 {
        EmpathyTpChatPriv *priv;
        EmpathyContact     *contact;