soc.2009.telepathy: b5609529: received_Pending_Messages was not used f...

[sttwister at soc.pidgin.im]

-----------------------------------------------------------------
Revision: b56095297e40adeda49e0d5829591b0654ba9ebe
Ancestor: edeab78c0328bfcf7d4f0bb88dd08563074b8535
Author: sttwister at soc.pidgin.im
Date: 2009-07-14T17:22:25
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/b56095297e40adeda49e0d5829591b0654ba9ebe

Modified files:
        libpurple/protocols/telepathy/telepathy_channel_text.c
        libpurple/protocols/telepathy/telepathy_channel_text.h

ChangeLog: 

received_Pending_Messages was not used for telepathy_room_channel

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy_channel_text.c	48f563783bfe1e4107f56e8e8ca9429708eaf6fd
+++ libpurple/protocols/telepathy/telepathy_channel_text.c	20ebf488f419aaf746e93f2cf0eaca0e25aecf7c
@@ -144,12 +144,8 @@ chat_list_pending_messages_cb  (TpChanne
 		{
 			purple_debug_warning("telepathy", "Pending message from %s,"
 					" but there's no channel struct for the chatroom!\n", who);
+			return;
 		}
-		else
-		{
-			/* we should now allow received_cb to handle incoming messages */
-			tp_channel->received_Pending_Messages = TRUE;
-		}
 
 		for (i = 0; i<out_Pending_Messages->len; ++i)
 		{
@@ -448,9 +444,7 @@ handle_room_text_channel (TpChannel *cha
 				error->message);
 	}
 
-	tp_channel->received_Pending_Messages = FALSE;
 
-
 	g_signal_connect(channel, "invalidated", G_CALLBACK(text_channel_invalidated_cb), data);
 
 	/* send pending messages */
============================================================
--- libpurple/protocols/telepathy/telepathy_channel_text.h	7006646d37d618109424747541ce354d58398490
+++ libpurple/protocols/telepathy/telepathy_channel_text.h	e5df31d1c7934b0fd990ba6d0ce6bdc1d08c04eb
@@ -36,8 +36,6 @@ typedef struct
 
 	GHashTable *contacts;
 
-	/* This flag avoids having a message processed twice via both Received signal and ListPendingMessages */
-	gboolean received_Pending_Messages;
 } telepathy_room_channel;
 
 void