From 11120f662d911b9a50aff7ba46804bcc7c587492 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 12 May 2011 14:33:16 +0100 Subject: message: stop storing pending-message-id We're storing the TpSignalledMessage for that nowadays. Signed-off-by: Jonny Lamb --- libempathy/empathy-message.c | 21 --------------------- libempathy/empathy-message.h | 2 -- 2 files changed, 23 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 64977e007..25ec498ce 100644 --- 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 52e45b6e2..b20ceca16 100644 --- 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); -- cgit v1.2.3