Changeset 9755

Timestamp:

06/03/08 16:15:57 (6 months ago)

Author:

asterix

Message:

improve new gmail e-mail popup window. Fixes #3252

Location:

trunk/src

Files:

• common/connection_handlers.py (modified) (3 diffs)
• gajim.py (modified) (2 diffs)

trunk/src/common/connection_handlers.py

@@ -1372 +1372 @@
                         HAS_IDLE = False
 
+                self.gmail_last_tid = None
+                self.gmail_last_time = None
+
         def build_http_auth_answer(self, iq_obj, answer):
                 if answer == 'yes':
@@ -1583 +1586 @@
                         gajim.log.debug('Got notification of new gmail e-mail on %s. Asking the server for more info.' % jid)
                         iq = common.xmpp.Iq(typ = 'get')
-                        iq.setAttr('id', '13')
+                        iq.setID(self.connection.getAnID())
                         query = iq.setTag('query')
                         query.setNamespace(common.xmpp.NS_GMAILNOTIFY)
+                        # we want only be notified about newer mails
+                        if self.gmail_last_tid:
+                                query.setAttr('newer-than-tid', self.gmail_last_tid)
+                        if self.gmail_last_time:
+                                query.setAttr('newer-than-time', self.gmail_last_time)
                         self.connection.send(iq)
                         raise common.xmpp.NodeProcessed
@@ -1602 +1610 @@
                                         gmail_messages = gm.getTag('mailbox').getTags('mail-thread-info')
                                         for gmessage in gmail_messages:
-                                                sender = gmessage.getTag('senders').getTag('sender')
-                                                if not sender:
+                                                unread_senders = []
+                                                for sender in gmessage.getTag('senders').getTags('sender'):
+                                                        if sender.getAttr('unread') != '1':
+                                                                continue
+                                                        if sender.getAttr('name'):
+                                                                unread_senders.append(sender.getAttr('name') + '< ' + \
+                                                                        sender.getAttr('address') + '>')
+                                                        else:
+                                                                unread_senders.append(sender.getAttr('address'))
+
+                                                if not unread_senders:
                                                         continue
-                                                gmail_from = sender.getAttr('address')
                                                 gmail_subject = gmessage.getTag('subject').getData()
                                                 gmail_snippet = gmessage.getTag('snippet').getData()
+                                                tid = int(gmessage.getAttr('tid'))
+                                                if not self.gmail_last_tid or tid > self.gmail_last_tid:
+                                                        self.gmail_last_tid = tid
                                                 gmail_messages_list.append({ \
-                                                        'From': gmail_from, \
+                                                        'From': unread_senders, \
                                                         'Subject': gmail_subject, \
-                                                        'Snippet': gmail_snippet})
+                                                        'Snippet': gmail_snippet, \
+                                                        'url': gmessage.getAttr('url'), \
+                                                        'participation': gmessage.getAttr('participation'), \
+                                                        'messages': gmessage.getAttr('messages'), \
+                                                        'date': gmessage.getAttr('date')})
+                                        self.gmail_last_time = int(gm.getTag('mailbox').getAttr(
+                                                'result-time'))
+
                                 jid = gajim.get_jid_from_account(self.name)
                                 gajim.log.debug(('You have %s new gmail e-mails on %s.') % (newmsgs, jid))

trunk/src/gajim.py

@@ -1649 +1649 @@
 
                         if gajim.config.get('notify_on_new_gmail_email_extra'):
+                                cnt = 0
                                 for gmessage in gmail_messages_list:
-                                        #FIXME: emulate Gtalk client popups. find out what they parse and how
-                                        #they decide what to show
-                                        # each message has a 'From', 'Subject' and 'Snippet' field
-                                        text += _('\nFrom: %(from_address)s') % \
-                                                {'from_address': gmessage['From']}
+                                        #FIXME: emulate Gtalk client popups. find out what they parse and
+                                        # how they decide what to show each message has a 'From',
+                                        # 'Subject' and 'Snippet' field
+                                        if cnt >=5:
+                                                break
+                                        senders = reduce(lambda b, a: a + ',\n     ' + b,
+                                                gmessage['From'])
+                                        text += _('\n\nFrom: %(from_address)s\nSubject: %(subject)s\n%(snippet)s') % \
+                                                {'from_address': senders, 'subject': gmessage['Subject'],
+                                                'snippet': gmessage['Snippet']} 
+                                        cnt += 1 
 
                         if gajim.config.get_per('soundevents', 'gmail_received', 'enabled'):
@@ -1660 +1667 @@
                         path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
                         notify.popup(_('New E-mail'), jid, account, 'gmail',
-                                path_to_image = path, title = title, text = text)
+                                path_to_image=path, title=title,
+                                text=gobject.markup_escape_text(text))
 
                 if self.remote_ctrl: