tags 560983 +patch
thanks
Dear Maintainer I've prepared a patch
Regards
diff -u gmail-notify-1.6.1.1/debian/changelog gmail-notify-1.6.1.1/debian/changelog
--- gmail-notify-1.6.1.1/debian/changelog
+++ gmail-notify-1.6.1.1/debian/changelog
@@ -1,3 +1,10 @@
+gmail-notify (1.6.1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Depends on gtk.StatusIcon instead of python-eggtrayicon (Closes: #560983)
+
+ -- Max Linke <max_linke-deb...@gmx.de> Sun, 04 Mar 2012 12:56:26 +0100
+
gmail-notify (1.6.1.1-1) unstable; urgency=medium
* Acknowledge my own NMU(!) (Closes: #546464)
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/debian/patches/09_gtkStatusIcon.patch
+++ gmail-notify-1.6.1.1/debian/patches/09_gtkStatusIcon.patch
@@ -0,0 +1,127 @@
+Index: gmail-notify-1.6.1.1/notifier.py
+===================================================================
+--- gmail-notify-1.6.1.1.orig/notifier.py 2012-03-04 12:56:13.000000000 +0100
++++ gmail-notify-1.6.1.1/notifier.py 2012-03-04 12:57:41.000000000 +0100
+@@ -6,12 +6,9 @@
+ import gtk
+ import time
+ import os
+-from egg.trayicon import TrayIcon
+ import sys
+ sys.path.insert (0, "/usr/lib/gmail-notify/")
+ import warnings
+-import ConfigParser
+-import xmllangs
+ import GmailConfig
+ import GmailPopupMenu
+ import gmailatom
+@@ -86,26 +83,7 @@
+ self.maintimer=None
+ self.popuptimer=0
+ self.waittimer=0
+- # Create the tray icon object
+- self.tray = TrayIcon(self.lang.get_string(21));
+- self.eventbox = gtk.EventBox()
+- self.tray.add(self.eventbox)
+- self.eventbox.connect("button_press_event", self.tray_icon_clicked)
+- # Tray icon drag&drop options
+- self.eventbox.drag_dest_set(
+- gtk.DEST_DEFAULT_ALL,
+- [('_NETSCAPE_URL', 0, 0),('text/uri-list ', 0, 1),('x-url/http', 0, 2)],
+- gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_MOVE)
+- # Create the tooltip for the tray icon
+- self._tooltip = gtk.Tooltips()
+- # Set the image for the tray icon
+- self.imageicon = gtk.Image()
+- pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
+- scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
+- self.imageicon.set_from_pixbuf(scaled_buf)
+- self.eventbox.add(self.imageicon)
+- # Show the tray icon
+- self.tray.show_all()
++
+ # Create the popup menu
+ self.popup_menu = GmailPopupMenu.GmailPopupMenu( self)
+ # Create the popup
+@@ -144,6 +122,14 @@
+ self.height+=self.options['voffset']
+ self.width+=self.options['hoffset']
+ self.window.move(gtk.gdk.screen_width() - self.width, gtk.gdk.screen_height() - self.height)
++ # Create the tray icon object
++ self.tray = gtk.StatusIcon()
++ self.tray.set_title(self.lang.get_string(21))
++ self.tray.connect("button_press_event",self.tray_icon_clicked)
++ # Set the image for the tray icon
++ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
++ scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
++ self.tray.set_from_pixbuf(scaled_buf)
+
+ self.init=1
+ while gtk.events_pending():
+@@ -162,7 +148,7 @@
+ return 0
+ self.dont_connect=1
+ print "connecting..."
+- self._tooltip.set_tip(self.tray,self.lang.get_string(13))
++ self.tray.set_tooltip(self.lang.get_string(13))
+ while gtk.events_pending():
+ gtk.main_iteration( gtk.TRUE)
+ # Attemp connection
+@@ -170,12 +156,12 @@
+ self.connection=gmailatom.GmailAtom(self.options['gmailusername'],self.options['gmailpassword'],self.options['proxy'])
+ self.connection.refreshInfo()
+ print "connection successful... continuing"
+- self._tooltip.set_tip(self.tray,self.lang.get_string(14))
++ self.tray.set_tooltip_text(self.lang.get_string(14))
+ self.dont_connect=0
+ return 1
+ except:
+ print "login failed, will retry"
+- self._tooltip.set_tip(self.tray,self.lang.get_string(15))
++ self.tray.set_tooltip_text(self.lang.get_string(15))
+ self.default_label = "<span size='large' ><u><i>"+self.lang.get_string(15)+"</i></u></span>\n\n"+self.lang.get_string(16)
+ self.label.set_markup(self.default_label)
+ self.show_popup()
+@@ -204,10 +190,6 @@
+ self.mailcheck=0
+ return gtk.TRUE
+
+- # Update tray icon
+- self.eventbox.remove(self.imageicon)
+- self.imageicon = gtk.Image()
+-
+ if attrs[1]>0:
+ print str(attrs[1])+" new messages"
+ sender = attrs[2]
+@@ -222,20 +204,18 @@
+ print str(attrs[0])+" unread messages"
+ s = ' '
+ if attrs[0]>1: s=self.lang.get_string(35)+" "
+- self._tooltip.set_tip(self.tray,(self.lang.get_string(19))%{'u':attrs[0],'s':s})
++ self.tray.set_tooltip_text((self.lang.get_string(19))%{'u':attrs[0],'s':s})
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON2_PATH )
+ else:
+ print "no new messages"
+ self.default_label="<span size='large' ><i><u>"+self.lang.get_string(21)+"</u></i></span>\n\n\n"+self.lang.get_string(18)
+- self._tooltip.set_tip(self.tray,self.lang.get_string(18))
++ self.tray.set_tooltip_text(self.lang.get_string(18))
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
+
+ p = re.compile('&')
+ self.label.set_markup(p.sub('&', self.default_label))
+ scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
+- self.imageicon.set_from_pixbuf(scaled_buf)
+- self.eventbox.add(self.imageicon)
+- self.tray.show_all()
++ self.tray.set_from_pixbuf(scaled_buf)
+ self.unreadmsgcount=attrs[0]
+
+ self.mailcheck=0
+@@ -323,7 +303,6 @@
+ self.window.move(gtk.gdk.screen_width() - self.width,positiony-2)
+ else:
+ # If popup is up, run wait timer
+- sizex=currentsize[0]
+ self.popup=1
+ if self.hassettimer==0:
+ self.waittimer = gtk.timeout_add(self.options['popuptimespan'],self.wait)
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/debian/patches/series
+++ gmail-notify-1.6.1.1/debian/patches/series
@@ -0,0 +1 @@
+09_gtkStatusIcon.patch
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/.pc/.quilt_patches
+++ gmail-notify-1.6.1.1/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/.pc/.quilt_series
+++ gmail-notify-1.6.1.1/.pc/.quilt_series
@@ -0,0 +1 @@
+series
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/.pc/.version
+++ gmail-notify-1.6.1.1/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/.pc/applied-patches
+++ gmail-notify-1.6.1.1/.pc/applied-patches
@@ -0,0 +1 @@
+09_gtkStatusIcon.patch
only in patch2:
unchanged:
--- gmail-notify-1.6.1.1.orig/.pc/09_gtkStatusIcon.patch/notifier.py
+++ gmail-notify-1.6.1.1/.pc/09_gtkStatusIcon.patch/notifier.py
@@ -0,0 +1,416 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Uploaded by juan_grande 2005/02/24 18:38 UTC
+import pygtk
+pygtk.require('2.0')
+import gtk
+import time
+import os
+from egg.trayicon import TrayIcon
+import sys
+sys.path.insert (0, "/usr/lib/gmail-notify/")
+import warnings
+import ConfigParser
+import xmllangs
+import GmailConfig
+import GmailPopupMenu
+import gmailatom
+import re
+
+BKG_PATH="/usr/share/apps/gmail-notify/background.jpg"
+ICON_PATH="/usr/share/apps/gmail-notify/icon.png"
+ICON2_PATH="/usr/share/apps/gmail-notify/icon2.png"
+
+def removetags(text):
+ raw=text.split("<b>")
+ raw2=raw[1].split("</b>")
+ final=raw2[0]
+ return final
+
+def shortenstring(text,characters):
+ if text == None: text = ""
+ mainstr=""
+ length=0
+ splitstr=text.split(" ")
+ for word in splitstr:
+ length=length+len(word)
+ if len(word)>characters:
+ if mainstr=="":
+ mainstr=word[0:characters]
+ break
+ else: break
+ mainstr=mainstr+word+" "
+ if length>characters: break
+ return mainstr.strip()
+
+class GmailNotify:
+
+ configWindow = None
+ options = None
+
+ def __init__(self):
+ self.init=0
+ print "Gmail Notifier v1.6.1b ("+time.strftime("%Y/%m/%d %H:%M:%S", time.localtime())+")"
+ print "----------"
+ # Configuration window
+ self.configWindow = GmailConfig.GmailConfigWindow( )
+ # Reference to global options
+ self.options = self.configWindow.options
+ # Check if there is a user and password, if not, load config window
+ if self.configWindow.no_username_or_password():
+ self.configWindow.show()
+ # If there's still not a username or password, just exit.
+ if self.configWindow.no_username_or_password():
+ sys.exit(0)
+ # Load selected language
+ self.lang = self.configWindow.get_lang()
+ print "selected language: "+self.lang.get_name()
+ # Creates the main window
+ self.window = gtk.Window(gtk.WINDOW_POPUP)
+ self.window.set_title(self.lang.get_string(21))
+ self.window.set_resizable(1)
+ self.window.set_decorated(0)
+ self.window.set_keep_above(1)
+ self.window.stick()
+ self.window.hide()
+ # Define some flags
+ self.senddown=0
+ self.popup=0
+ self.newmessages=0
+ self.mailcheck=0
+ self.hasshownerror=0
+ self.hassettimer=0
+ self.dont_connect=0
+ self.unreadmsgcount=0
+ # Define the timers
+ self.maintimer=None
+ self.popuptimer=0
+ self.waittimer=0
+ # Create the tray icon object
+ self.tray = TrayIcon(self.lang.get_string(21));
+ self.eventbox = gtk.EventBox()
+ self.tray.add(self.eventbox)
+ self.eventbox.connect("button_press_event", self.tray_icon_clicked)
+ # Tray icon drag&drop options
+ self.eventbox.drag_dest_set(
+ gtk.DEST_DEFAULT_ALL,
+ [('_NETSCAPE_URL', 0, 0),('text/uri-list ', 0, 1),('x-url/http', 0, 2)],
+ gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_MOVE)
+ # Create the tooltip for the tray icon
+ self._tooltip = gtk.Tooltips()
+ # Set the image for the tray icon
+ self.imageicon = gtk.Image()
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
+ scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
+ self.imageicon.set_from_pixbuf(scaled_buf)
+ self.eventbox.add(self.imageicon)
+ # Show the tray icon
+ self.tray.show_all()
+ # Create the popup menu
+ self.popup_menu = GmailPopupMenu.GmailPopupMenu( self)
+ # Create the popup
+ self.fixed=gtk.Fixed()
+ self.window.add(self.fixed)
+ self.fixed.show()
+ self.fixed.set_size_request(0,0)
+ # Set popup's background image
+ self.image=gtk.Image()
+ self.image.set_from_file( BKG_PATH )
+ self.image.show()
+ self.fixed.put(self.image,0,0)
+ # Set popup's label
+ self.label=gtk.Label()
+ self.label.set_line_wrap(1)
+ self.label.set_size_request(170,140)
+ self.default_label = "<span size='large' ><i><u>"+self.lang.get_string(21)+"</u></i></span>\n\n\n"+self.lang.get_string(20)
+ self.label.set_markup( self.default_label)
+ # Show popup
+ self.label.show()
+ # Create popup's event box
+ self.event_box = gtk.EventBox()
+ self.event_box.set_visible_window(0)
+ self.event_box.show()
+ self.event_box.add(self.label)
+ self.event_box.set_size_request(180,125)
+ self.event_box.set_events(gtk.gdk.BUTTON_PRESS_MASK)
+ self.event_box.connect("button_press_event", self.event_box_clicked)
+ # Setup popup's event box
+ self.fixed.put(self.event_box,6,25)
+ self.event_box.realize()
+ self.event_box.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND1))
+ # Resize and move popup's event box
+ self.window.resize(180,1)
+ self.width, self.height = self.window.get_size()
+ self.height+=self.options['voffset']
+ self.width+=self.options['hoffset']
+ self.window.move(gtk.gdk.screen_width() - self.width, gtk.gdk.screen_height() - self.height)
+
+ self.init=1
+ while gtk.events_pending():
+ gtk.main_iteration(gtk.TRUE)
+ # Attemp connection for first time
+ if self.connect()==1:
+ # Check mail for first time
+ self.mail_check()
+
+ self.maintimer=gtk.timeout_add(self.options['checkinterval'],self.mail_check)
+
+ def connect(self):
+ # If connecting, cancel connection
+ if self.dont_connect==1:
+ print "connection attemp suspended"
+ return 0
+ self.dont_connect=1
+ print "connecting..."
+ self._tooltip.set_tip(self.tray,self.lang.get_string(13))
+ while gtk.events_pending():
+ gtk.main_iteration( gtk.TRUE)
+ # Attemp connection
+ try:
+ self.connection=gmailatom.GmailAtom(self.options['gmailusername'],self.options['gmailpassword'],self.options['proxy'])
+ self.connection.refreshInfo()
+ print "connection successful... continuing"
+ self._tooltip.set_tip(self.tray,self.lang.get_string(14))
+ self.dont_connect=0
+ return 1
+ except:
+ print "login failed, will retry"
+ self._tooltip.set_tip(self.tray,self.lang.get_string(15))
+ self.default_label = "<span size='large' ><u><i>"+self.lang.get_string(15)+"</i></u></span>\n\n"+self.lang.get_string(16)
+ self.label.set_markup(self.default_label)
+ self.show_popup()
+ self.dont_connect=0
+ return 0
+
+ def mail_check(self, event=None):
+ # If checking, cancel mail check
+ if self.mailcheck==1:
+ print "self.mailcheck=1"
+ return gtk.TRUE
+ # If popup is up, destroy it
+ if self.popup==1:
+ self.destroy_popup()
+ self.mailcheck=1
+ print "----------"
+ print "checking for new mail ("+time.strftime("%Y/%m/%d %H:%M:%S", time.localtime())+")"
+ while gtk.events_pending():
+ gtk.main_iteration( gtk.TRUE)
+
+ # Get new messages count
+ attrs = self.has_new_messages()
+
+ # If mail check was unsuccessful
+ if attrs[0]==-1:
+ self.mailcheck=0
+ return gtk.TRUE
+
+ # Update tray icon
+ self.eventbox.remove(self.imageicon)
+ self.imageicon = gtk.Image()
+
+ if attrs[1]>0:
+ print str(attrs[1])+" new messages"
+ sender = attrs[2]
+ subject= attrs[3]
+ snippet= attrs[4]
+ if len(snippet)>0:
+ self.default_label="<span size='large' ><u><i>"+self.lang.get_string(17)+sender[0:24]+"</i></u></span>\n"+shortenstring(subject,20)+"\n\n"+snippet+"..."
+ else:
+ self.default_label="<span size='large' ><u><i>"+self.lang.get_string(17)+sender[0:24]+"</i></u></span>\n"+shortenstring(subject,20)+"\n\n"+snippet+"..."
+ self.show_popup()
+ if attrs[0]>0:
+ print str(attrs[0])+" unread messages"
+ s = ' '
+ if attrs[0]>1: s=self.lang.get_string(35)+" "
+ self._tooltip.set_tip(self.tray,(self.lang.get_string(19))%{'u':attrs[0],'s':s})
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON2_PATH )
+ else:
+ print "no new messages"
+ self.default_label="<span size='large' ><i><u>"+self.lang.get_string(21)+"</u></i></span>\n\n\n"+self.lang.get_string(18)
+ self._tooltip.set_tip(self.tray,self.lang.get_string(18))
+ pixbuf = gtk.gdk.pixbuf_new_from_file( ICON_PATH )
+
+ p = re.compile('&')
+ self.label.set_markup(p.sub('&', self.default_label))
+ scaled_buf = pixbuf.scale_simple(24,24,gtk.gdk.INTERP_BILINEAR)
+ self.imageicon.set_from_pixbuf(scaled_buf)
+ self.eventbox.add(self.imageicon)
+ self.tray.show_all()
+ self.unreadmsgcount=attrs[0]
+
+ self.mailcheck=0
+
+ return gtk.TRUE
+
+ def has_new_messages( self):
+ unreadmsgcount=0
+ # Get total messages in inbox
+ try:
+ self.connection.refreshInfo()
+ unreadmsgcount=self.connection.getUnreadMsgCount()
+ except:
+ # If an error ocurred, cancel mail check
+ print "getUnreadMsgCount() failed, will try again soon"
+ return (-1,)
+
+ sender=''
+ subject=''
+ snippet=''
+ finalsnippet=''
+ if unreadmsgcount>0:
+ # Get latest message data
+ sender = self.connection.getMsgAuthorName(0)
+ subject = self.connection.getMsgTitle(0)
+ snippet = self.connection.getMsgSummary(0)
+ if len(sender)>12:
+ finalsnippet=shortenstring(snippet,20)
+ else:
+ finalsnippet=shortenstring(snippet,40)
+ # Really new messages? Or just repeating...
+ newmsgcount=unreadmsgcount-self.unreadmsgcount
+ self.unreadmsgcount=unreadmsgcount
+ if unreadmsgcount>0:
+ return (unreadmsgcount, newmsgcount, sender, subject, finalsnippet)
+ else:
+ return (unreadmsgcount,0, sender, subject, finalsnippet)
+
+ def show_popup(self):
+ # If popup is up, destroy it
+ if self.popup==1:
+ self.destroy_popup()
+ # Generate popup
+ print "generating popup"
+ self.popuptimer = gtk.timeout_add(self.options['animationdelay'],self.popup_proc)
+ self.window.show()
+ return
+
+ def destroy_popup(self):
+ print "destroying popup"
+ if self.popuptimer>0:gtk.timeout_remove(self.popuptimer)
+ if self.waittimer>0: gtk.timeout_remove(self.waittimer)
+ self.senddown=0
+ self.hassettimer=0
+ self.window.hide()
+ self.window.resize(180,1)
+ self.window.move(gtk.gdk.screen_width() - self.width, gtk.gdk.screen_height() - self.height)
+ return
+
+ def popup_proc(self):
+ # Set popup status flag
+ if self.popup==0:
+ self.popup=1
+ currentsize=self.window.get_size()
+ currentposition=self.window.get_position()
+ positiony=currentposition[1]
+ sizey=currentsize[1]
+ if self.senddown==1:
+ if sizey<2:
+ # If popup is down
+ self.senddown=0
+ self.window.hide()
+ self.window.resize(180,1)
+ self.window.move(gtk.gdk.screen_width() - self.width, gtk.gdk.screen_height() - self.height)
+ self.popup=0
+ return gtk.FALSE
+ else:
+ # Move it down
+ self.window.resize(180,sizey-2)
+ self.window.move(gtk.gdk.screen_width() - self.width,positiony+2)
+ else:
+ if sizey<140:
+ # Move it up
+ self.window.resize(180,sizey+2)
+ self.window.move(gtk.gdk.screen_width() - self.width,positiony-2)
+ else:
+ # If popup is up, run wait timer
+ sizex=currentsize[0]
+ self.popup=1
+ if self.hassettimer==0:
+ self.waittimer = gtk.timeout_add(self.options['popuptimespan'],self.wait)
+ self.hassettimer=1
+ return gtk.TRUE
+
+ def wait(self):
+ self.senddown=1
+ self.hassettimer=0
+ return gtk.FALSE
+
+ def tray_icon_clicked(self,signal,event):
+ if event.button==3:
+ self.popup_menu.show_menu(event)
+ else:
+ self.label.set_markup(self.default_label)
+ self.show_popup()
+
+ def event_box_clicked(self,signal,event):
+ if event.button==1:
+ self.gotourl()
+
+ def exit(self, event):
+ dialog = gtk.MessageDialog( None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, self.lang.get_string(5))
+ dialog.width, dialog.height = dialog.get_size()
+ dialog.move( gtk.gdk.screen_width()/2-dialog.width/2, gtk.gdk.screen_height()/2-dialog.height/2)
+ ret = dialog.run()
+ if( ret==gtk.RESPONSE_YES):
+ gtk.main_quit(0)
+ dialog.destroy()
+
+ def gotourl( self, wg=None):
+ print "----------"
+ print "launching browser "+self.options['browserpath']+" http://mail.google.com";
+ os.system(self.options['browserpath']+" http://mail.google.com &")
+
+ def show_quota_info( self, event):
+ print "Not available"
+ #if self.popup==1:self.destroy_popup()
+ #print "----------"
+ #print "retrieving quota info"
+ #while gtk.events_pending()!=0:
+ # gtk.main_iteration(gtk.TRUE)
+ #try:
+ # usage=self.connection.getQuotaInfo()
+ #except:
+ # if self.connect()==0:
+ # return
+ # else:
+ # usage=self.connection.getQuotaInfo()
+ #self.label.set_markup("<span size='large' ><u><i>"+self.lang.get_string(6)+"</i></u></span>\n\n"+self.lang.get_string(24)%{'u':usage[0],'t':usage[1],'p':usage[2]})
+ #self.show_popup()
+
+ def update_config(self, event=None):
+ # Kill all timers
+ if self.popup==1:self.destroy_popup()
+ if self.init==1:gtk.timeout_remove(self.maintimer)
+ # Run the configuration dialog
+ self.configWindow.show()
+
+ # Update timeout
+ self.maintimer = gtk.timeout_add(self.options["checkinterval"], self.mail_check )
+
+ # Update user/pass
+ self.connection=gmailatom.GmailAtom(self.options["gmailusername"],self.options["gmailpassword"],self.options['proxy'])
+ self.connect()
+ self.mail_check()
+
+ # Update popup location
+ self.window.resize(180,1)
+ self.width, self.height = self.window.get_size()
+ self.height +=self.options["voffset"]
+ self.width +=self.options["hoffset"]
+ self.window.move(gtk.gdk.screen_width() - self.width, gtk.gdk.screen_height() - self.height)
+
+ # Update language
+ self.lang=self.configWindow.get_lang()
+
+ # Update popup menu
+ self.popup_menu = GmailPopupMenu.GmailPopupMenu(self)
+
+ return
+
+ def main(self):
+ gtk.main()
+
+if __name__ == "__main__":
+ warnings.filterwarnings( action="ignore", category=DeprecationWarning)
+ gmailnotifier = GmailNotify()
+ gmailnotifier.main()
