Ignore and acknowledge empty NonTextContent messages.

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

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 57e3277ebe51500cd42ed62e6e661a616196508b..7915ff20b659396697317037fd0ed78399b860bc 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -28,6 +28,7 @@
 #include <telepathy-glib/util.h>
 
 #include "empathy-tp-chat.h"
+#include "empathy-tp-group.h"
 #include "empathy-contact-factory.h"
 #include "empathy-contact-monitor.h"
 #include "empathy-contact-list.h"
@@ -91,6 +92,8 @@ G_DEFINE_TYPE_WITH_CODE (EmpathyTpChat, empathy_tp_chat, G_TYPE_OBJECT,
                         G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
                                                tp_chat_iface_init));
 
+static void acknowledge_messages (EmpathyTpChat *chat, GArray *ids);
+
 static void
 tp_chat_invalidated_cb (TpProxy       *proxy,
                        guint          domain,
@@ -227,13 +230,17 @@ tp_chat_add (EmpathyContactList *list,
             const gchar        *message)
 {
        EmpathyTpChatPriv *priv = GET_PRIV (list);
+       TpHandle           handle;
+       GArray             handles = {(gchar *) &handle, 1};
 
        g_return_if_fail (EMPATHY_IS_TP_CHAT (list));
        g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
-       if (priv->group) {
-               empathy_tp_group_add_member (priv->group, contact, message);
-       }
+       handle = empathy_contact_get_handle (contact);
+       tp_cli_channel_interface_group_call_add_members (priv->channel, -1,
+                                                        &handles, NULL,
+                                                        NULL, NULL, NULL,
+                                                        NULL);
 }
 
 static void
@@ -242,13 +249,17 @@ tp_chat_remove (EmpathyContactList *list,
                const gchar        *message)
 {
        EmpathyTpChatPriv *priv = GET_PRIV (list);
+       TpHandle           handle;
+       GArray             handles = {(gchar *) &handle, 1};
 
        g_return_if_fail (EMPATHY_IS_TP_CHAT (list));
        g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
-       if (priv->group) {
-               empathy_tp_group_remove_member (priv->group, contact, message);
-       }
+       handle = empathy_contact_get_handle (contact);
+       tp_cli_channel_interface_group_call_remove_members (priv->channel, -1,
+                                                           &handles, NULL,
+                                                           NULL, NULL, NULL,
+                                                           NULL);
 }
 
 static GList *
@@ -423,6 +434,20 @@ tp_chat_received_cb (TpChannel   *channel,
  
        DEBUG ("Message received: %s", message_body);
 
+       if (message_flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT &&
+           !tp_strdiff (message_body, "")) {
+               GArray *ids;
+
+               DEBUG ("Empty message with NonTextContent, ignoring and acking.");
+
+               ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
+               g_array_append_val (ids, message_id);
+               acknowledge_messages (EMPATHY_TP_CHAT (chat), ids);
+               g_array_free (ids, TRUE);
+
+               return;
+       }
+
        message = tp_chat_build_message (EMPATHY_TP_CHAT (chat),
                                         message_id,
                                         message_type,
@@ -537,6 +562,7 @@ tp_chat_list_pending_messages_cb (TpChannel       *channel,
 {
        EmpathyTpChatPriv *priv = GET_PRIV (chat);
        guint              i;
+       GArray            *empty_non_text_content_ids = NULL;
 
        priv->listing_pending_messages = FALSE;
 
@@ -569,6 +595,18 @@ tp_chat_list_pending_messages_cb (TpChannel       *channel,
 
                DEBUG ("Message pending: %s", message_body);
 
+               if (message_flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT &&
+                   !tp_strdiff (message_body, "")) {
+                       DEBUG ("Empty message with NonTextContent, ignoring and acking.");
+
+                       if (empty_non_text_content_ids == NULL) {
+                               empty_non_text_content_ids = g_array_new (FALSE, FALSE, sizeof (guint));
+                       }
+
+                       g_array_append_val (empty_non_text_content_ids, message_id);
+                       continue;
+               }
+
                message = tp_chat_build_message (EMPATHY_TP_CHAT (chat),
                                                 message_id,
                                                 message_type,
@@ -579,6 +617,11 @@ tp_chat_list_pending_messages_cb (TpChannel       *channel,
                tp_chat_emit_or_queue_message (EMPATHY_TP_CHAT (chat), message);
                g_object_unref (message);
        }
+
+       if (empty_non_text_content_ids != NULL) {
+               acknowledge_messages (EMPATHY_TP_CHAT (chat), empty_non_text_content_ids);
+               g_array_free (empty_non_text_content_ids, TRUE);
+       }
 }
 
 static void
@@ -924,6 +967,10 @@ tp_chat_dispose (GObject *object)
                g_object_unref (priv->account);
        priv->account = NULL;
 
+       if (priv->contact_monitor)
+               g_object_unref (priv->contact_monitor);
+       priv->contact_monitor = NULL;
+
        if (!g_queue_is_empty (priv->messages_queue)) {
                EmpathyMessage *message;
                EmpathyContact *contact;
@@ -966,20 +1013,7 @@ tp_chat_finalize (GObject *object)
                g_ptr_array_free (priv->properties, TRUE);
        }
 
-       if (priv->remote_contact) {
-               g_object_unref (priv->remote_contact);
-       }
-       if (priv->group) {
-               g_object_unref (priv->group);
-       }
 
-       if (priv->contact_monitor) {
-               g_object_unref (priv->contact_monitor);
-       }
-
-       g_object_unref (priv->factory);
-       g_object_unref (priv->user);
-       g_object_unref (priv->account);
        g_free (priv->id);
        g_queue_free (priv->messages_queue);
        g_queue_free (priv->pending_messages_queue);
@@ -1053,7 +1087,7 @@ tp_chat_set_property (GObject      *object,
 
        switch (param_id) {
        case PROP_CHANNEL:
-               priv->channel = g_object_ref (g_value_get_object (value));
+               priv->channel = g_value_dup_object (value);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1187,6 +1221,7 @@ empathy_tp_chat_close (EmpathyTpChat *chat) {
           We loose the ordering of sent messages though */
        g_signal_handlers_disconnect_by_func (priv->channel,
                tp_chat_invalidated_cb, chat);
+
        tp_cli_channel_call_close (priv->channel, -1, tp_chat_async_cb,
                "closing channel", NULL, NULL);