message: stop storing pending-message-id

We're storing the TpSignalledMessage for that nowadays.

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 64977e00707c8b891b9e9eff915c30aa2a6b5dd2..25ec498ce9e16589df610d139f5fa34a7f0c474f 100644 (file)
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -596,16 +596,6 @@ empathy_message_type_to_str (TpChannelTextMessageType type)
        }
 }
 
-guint
-empathy_message_get_id (EmpathyMessage *message)
-{
-       EmpathyMessagePriv *priv = GET_PRIV (message);
-
-       g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), 0);
-
-       return priv->id;
-}
-
 gboolean
 empathy_message_is_incoming (EmpathyMessage *message)
 {
@@ -651,10 +641,8 @@ empathy_message_new_from_tp_message (TpMessage *tp_msg,
                                     gboolean incoming)
 {
        EmpathyMessage *message;
-       EmpathyMessagePriv *priv;
        gchar *body;
        TpChannelTextMessageFlags flags;
-       guint id;
 
        g_return_val_if_fail (TP_IS_MESSAGE (tp_msg), NULL);
 
@@ -670,15 +658,6 @@ empathy_message_new_from_tp_message (TpMessage *tp_msg,
                "tp-message", tp_msg,
                NULL);
 
-       priv = GET_PRIV (message);
-
-       /* FIXME: this is pretty low level, ideally we shouldn't have to use the
-        * ID directly but we don't use TpTextChannel's ack API everywhere yet. */
-       id = tp_asv_get_uint32 (tp_message_peek (tp_msg, 0),
-               "pending-message-id", NULL);
-
-       priv->id = id;
-
        g_free (body);
        return message;
 }

diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index 52e45b6e2ef121f088ec33734548acfd445e88dd..b20ceca16a2024b305c8d39c2e1a0176bab6ea6a 100644 (file)
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -77,8 +77,6 @@ gboolean                 empathy_message_should_highlight  (EmpathyMessage
 TpChannelTextMessageType empathy_message_type_from_str     (const gchar              *type_str);
 const gchar *            empathy_message_type_to_str       (TpChannelTextMessageType  type);
 
-guint                    empathy_message_get_id (EmpathyMessage *message);
-
 gboolean                 empathy_message_equal (EmpathyMessage *message1, EmpathyMessage *message2);
 
 TpChannelTextMessageFlags empathy_message_get_flags        (EmpathyMessage           *message);