Ticket #1982: gmail_extra_details-v1.patch

src/config.py

@@ -441 +441 @@
                 # Notify user of new gmail e-mail messages,
                 # only show checkbox if user has a gtalk account
                 notify_gmail_checkbutton = self.xml.get_widget('notify_gmail_checkbutton')
+                notify_gmail_extra_checkbutton = self.xml.get_widget('notify_gmail_extra_checkbutton')
                 notify_gmail_checkbutton.set_no_show_all(True)
+                notify_gmail_extra_checkbutton.set_no_show_all(True)
                 for account in gajim.config.get_per('accounts'):
                         jid = gajim.get_jid_from_account(account)
                         if gajim.get_server_from_jid(jid) == 'gmail.com':
                                 st = gajim.config.get('notify_on_new_gmail_email')
                                 notify_gmail_checkbutton.set_active(st)
                                 notify_gmail_checkbutton.show()
+                                st = gajim.config.get('notify_on_new_gmail_email_extra')
+                                notify_gmail_extra_checkbutton.set_active(st)
+                                notify_gmail_extra_checkbutton.show()
                                 break
                 else:
                         notify_gmail_checkbutton.hide()
+                        notify_gmail_extra_checkbutton.hide()
                 
                 self.xml.signal_autoconnect(self)
 
@@ -846 +852 @@
         def on_send_os_info_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'send_os_info')
                 
-        def on_notify_gmail_checkbutton_toggled(self, widget): 
+        def on_notify_gmail_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email')
+
+        def on_notify_gmail_extra_checkbutton_toggled(self, widget):
+                self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email_extra')
                 
         def fill_msg_treeview(self):
                 self.xml.get_widget('delete_msg_button').set_sensitive(False)

src/gajim.py

@@ -1026 +1026 @@
         def handle_event_gmail_notify(self, account, array):
                 jid = array[0]
                 gmail_new_messages = int(array[1])
+                gmail_messages_list = array[2]
                 if gajim.config.get('notify_on_new_gmail_email'):
                         img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
                                 'single_msg_recv.png') #FIXME: find a better image
                         title = _('New E-mail on %(gmail_mail_address)s') % \
                                 {'gmail_mail_address': jid}
                         text = i18n.ngettext('You have %d new E-mail message', 'You have %d new E-mail messages', gmail_new_messages, gmail_new_messages, gmail_new_messages)
+                        
+                        if gajim.config.get('notify_on_new_gmail_email_extra'):
+                                for gmessage in gmail_messages_list:
+                                        # each message has a 'From', 'Subject' and 'Snippet' field
+                                        text += _('\nFrom: %(from_address)s') % \
+                                                {'from_address': gmessage['From']}
+                                        
                         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)

src/common/config.py

@@ -126 +126 @@
                 'after_nickname': [ opt_str, ':' ],
                 'send_os_info': [ opt_bool, True ],
                 'notify_on_new_gmail_email': [ opt_bool, True ],
+                'notify_on_new_gmail_email_extra': [ opt_bool, True ],
                 'usegpg': [ opt_bool, False, '', True ],
                 'use_gpg_agent': [ opt_bool, False ],
                 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')],

src/common/connection_handlers.py

@@ -1239 +1239 @@
                         newmsgs = gm.getTag('mailbox').getAttr('total-matched')
                         if newmsgs != '0':
                                 # there are new messages
+                                if gm.getTag('mailbox').getTag('mail-thread-info'):
+                                        gmail_messages = gm.getTag('mailbox').getTags('mail-thread-info')
+                                        gmail_messages_list = []
+                                        for gmessage in gmail_messages:
+                                                gmail_from = gmessage.getTag('senders').getTag('sender').getAttr('address')
+                                                gmail_subject = gmessage.getTag('subject').getData()
+                                                gmail_snippet = gmessage.getTag('snippet').getData()
+                                                gmail_messages_list.append({ \
+                                                        'From': gmail_from, \
+                                                        'Subject': gmail_subject, \
+                                                        'Snippet': gmail_snippet})
                                 jid = gajim.get_jid_from_account(self.name)
                                 gajim.log.debug(('You have %s new gmail e-mails on %s.') % (newmsgs, jid))
-                                self.dispatch('GMAIL_NOTIFY', (jid, newmsgs))
+                                self.dispatch('GMAIL_NOTIFY', (jid, newmsgs, gmail_messages_list))
                         raise common.xmpp.NodeProcessed
 
         def _messageCB(self, con, msg):

data/glade/preferences_window.glade

@@ -3164 +3164 @@
                               <property name="fill">False</property>
                             </packing>
                           </child>
+
+                          <child>
+                            <widget class="GtkCheckButton" id="notify_gmail_extra_checkbutton">
+                              <property name="can_focus">True</property>
+                              <property name="label" translatable="yes">Display _extra email details</property>
+                              <property name="use_underline">True</property>
+                              <property name="relief">GTK_RELIEF_NORMAL</property>
+                              <property name="focus_on_click">True</property>
+                              <property name="active">False</property>
+                              <property name="inconsistent">False</property>
+                              <property name="draw_indicator">True</property>
+                              <signal name="toggled" handler="on_notify_gmail_extra_checkbutton_toggled" last_modification_time="Wed, 06 Apr 2005 14:43:56 GMT"/>                               
+                            </widget>
+                            <packing>
+                              <property name="padding">0</property>
+                              <property name="expand">False</property>
+                              <property name="fill">False</property>
+                            </packing>
+                          </child>
                         </widget>
                       </child>
                     </widget>