From b35ce053313ed3416db2ab484842167e0e25d85b Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Tue, 29 Jul 2008 15:00:56 +0000
Subject: #7692: Don't show pending messages when joining a chat

---
diff --git a/NEWS b/NEWS
index dc83427..e6ac619 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+* #7692: Don't show pending messages when joining a chat (morgs)
+* Updated translations: nl, te, es
+
 43
 
 * Updated translations: zh_TW, ja
diff --git a/pippy_app.py b/pippy_app.py
index b125b78..54f8947 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -110,6 +110,7 @@ class Chat(ViewSourceActivity):
         text_channel = Channel(bus_name, channel)
         self.text_channel = TextChannelWrapper(text_channel, conn)
         self.text_channel.set_received_callback(self._received_cb)
+        self.text_channel.handle_pending_messages()
         self._chat_is_room = False
         self._alert(_('On-line'), _('Private Chat'))
 
@@ -535,7 +536,8 @@ class TextChannelWrapper(object):
         self._text_chan[CHANNEL_TYPE_TEXT].connect_to_signal('Received',
             self._received_cb)
 
-        # handle pending messages
+    def handle_pending_messages(self):
+        """Get pending messages and show them as received."""
         for id, timestamp, sender, type, flags, text in \
             self._text_chan[
                 CHANNEL_TYPE_TEXT].ListPendingMessages(False):
@@ -663,6 +665,9 @@ CHAT_ICON=\
 """
 
 CHAT_NEWS="""
+* #7692: Don't show pending messages when joining a chat (morgs)
+* Updated translations: nl, te, es
+
 43
 
 * Updated translations: zh_TW, ja
--
cgit v0.9.1