Merge lp:~mate-ob/gm-notify/multi-account into lp:gm-notify

[Mateusz Balbus]

Changes:
- Added multi-account support
- Added support for multiple ports (default port 443)
- Added error messages
- Refactored the code
- Made app a single instance
- Added support for MP3 sound files

=== modified file 'README'
--- README	2010-09-18 13:06:25 +0000
+++ README	2015-12-05 00:25:32 +0000
@@ -1,4 +1,5 @@
-gm-notify 0.10.3 README
+gm-notify 1.0 README
+
 ------------------------------------
 
 QUICK INSTALLATION:
@@ -9,56 +10,66 @@
 The Configuration-Dialog is placed unter System-Settings-GMail Notifier Configuration.
 
 DEPENDENCIES:
+
 - python-indicate
 - python-notify
-- python-gst0.10
+- gir1.2-gstreamer-1.0
+- python-glade2
 - python-gtk2
 - python-gconf
 - python-twisted-words
 - python-gnomekeyring
 
 install via
-sudo apt-get install python-indicate python-notify python-gst0.10 python-gtk2 python-gconf python-twisted-words python-gnomekeyring
+sudo apt-get install python-indicate python-notify gir1.2-gstreamer-1.0 python-glade2 python-gtk2 python-gconf python-twisted-words python-gnomekeyring
 
 ------------------------------------
 
 RELEASE NOTES:
 
-v0.10.3:
-- Fixed CPU Usage Bug occuring on Maverick
-- Included Bulgarian Translation
-- Correct Priority Inbox usage
-- Mutt Label support
+v1.0:
+
+- Added multi-account support
+- Added support for multiple ports (default port 443)
+- Added error messages
+- Refactored the code
+- Made app a single instance
 
 v0.10.2:
+
 - Added Checkbox to ignore the inbox
 - fixed autorun
 - fixed some other small bugs
 
 v0.10.1:
+
 - Configurable autorun
 - Usage of Ubuntu's default mail icon
 - Fix of a displaying bug
 - Ignoring the inbox is possible (see http://bleedingpaper.com/gm-notify)
 
 v0.10:
+
 - Written for Lucid 10.04 (no warranty that older versions will be supported)
 - Finally switched to Google Talk backend for instant mail notification (hopefully this time it'll last longer ;-) )
 - Labels with a count of 0 will be hidden (except Inbox)
 - Sound properties work again
 
 v0.9:
+
 - Switched to IMAP backend (twisted), now allowing to check different labels
 - allows to choose if it should start webinterface or native client
 - Fixed many bugs/crashes
 
 v0.8:
+
 - included Danish translation
 - integrated with GNOME Sound Framework.
 - Fixed Bug #367242
 - warn when using small check intervals
 
 v0.7:
+
 - included (old) Catalan translation
 - German and English is completely translated (I hope my English weren't to bad ;-) )
 - added a graphical configuration interface
@@ -76,9 +87,11 @@
 Concept and code taken from cgmail
 implemented by Sassur <[e-mail]>
 
-all the rest is written 2009-2010 by Alexander Hungenberg
+all the rest developed and maintained by:
[phone] by Alexander Hungenberg
+2015 Mateusz Balbus
 
-------------------------------------------------------------------------
+------------------------------------
 
 LICENSE:
 
 
=== added file 'account_config.py'
--- account_config.py	1970-01-01 00:00:00 +0000
+++ account_config.py	2015-12-05 00:25:32 +0000
@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# account_config.py v0.10.3
+# Provides settins to GMail notify
+#
+# Copyright (c) 2015, Mateusz Balbus <[e-mail]>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
+
+import os
+import gettext
+
+from gi.repository import Gio, Gtk
+from twisted.words.protocols.jabber import jid
+
+from gtalk import MailChecker
+import account_settings_provider
+
+_ = gettext.translation('gm-notify', fallback=True).ugettext
+
+class AccountConfig:
+    def __init__(self, keys, creds):
+        self.keys = keys
+        self.creds = creds
+    
+    def init_window(self, parent):
+        if os.path.exists("gm-config.ui"):
+            builder_file = "gm-config.ui"
+        elif os.path.exists("/usr/local/share/gm-notify/gm-config.ui"):
+            builder_file = "/usr/local/share/gm-notify/gm-config.ui"
+        elif os.path.exists("/usr/share/gm-notify/gm-config.ui"):
+            builder_file = "/usr/share/gm-notify/gm-config.ui"
+
+        self.wTree = Gtk.Builder.new()
+        self.wTree.add_from_file(builder_file)
+        self.wTree.set_translation_domain("gm-notify")
+        self.window = self.wTree.get_object("gmnotify_add_account")
+
+        self.window.set_transient_for(parent)
+        self.window.set_modal(True)
+        self.window.set_destroy_with_parent(True)
+        
+        self.window.show_all()
+
+        self.wTree.get_object("notebook_main").set_current_page(0)
+        
+        self.input_user = self.wTree.get_object("input_user")
+        self.input_password = self.wTree.get_object("input_password")
+        self.image_credentials = self.wTree.get_object("image_credentials")
+        self.label_credentials = self.wTree.get_object("label_credentials")
+        self.button_apply = self.wTree.get_object("button_apply")
+
+        self.window.connect("delete_event", self.close)
+        self.wTree.get_object("button_close").connect("clicked", self.close)
+        self.button_apply.connect("clicked", self.apply)
+        self.input_password.connect("focus-out-event", self.check_credentials)
+        self.input_user.connect("focus-out-event", self.check_user)
+        self.wTree.get_object("checkbutton_sound").connect("toggled", self.on_checkbutton_sound_toggled)
+
+        #####
+        # Init with stored values
+        #####
+        
+        # Credentials
+
+        settings_provider = account_settings_provider.create_settings_provider(self.creds.username)
+
+        if self.creds.username:
+            self.input_user.set_text(self.creds.username)
+            self.input_user.set_sensitive(False)
+            
+        self.input_password.set_text(self.creds.password)
+         
+        self.api = MailChecker("", "", settings_provider)
+        self.api.setOnAuthSucceeded(self.credentials_valid)
+        self.api.setOnAuthFailed(self.credentials_invalid)
+        self.api.setOnConnectionErrorCB(self.connection_error)
+
+        self.check_credentials(None, None)
+
+        # Sound
+        self.wTree.get_object("checkbutton_sound").set_active(settings_provider.retrieve_sound_enabled())
+        sound_file = settings_provider.retrieve_sound_file()
+        if sound_file:
+            self.wTree.get_object("fcbutton_sound").set_filename(sound_file)
+        self.on_checkbutton_sound_toggled(self.wTree.get_object("checkbutton_sound"))
+         
+        # ClickAction
+        if settings_provider.retrieve_use_mail_client():
+            self.wTree.get_object("radiobutton_openclient").set_active(True)
+        else:
+            self.wTree.get_object("radiobutton_openweb").set_active(True)
+         
+        # Mailboxes
+        self.wTree.get_object("checkbutton_inbox").set_active(settings_provider.retrieve_ignore_inbox())
+        labels = settings_provider.retrieve_labels()
+        self.wTree.get_object("entry_labels").set_text(", ".join(labels))
+
+        return self.window
+    
+    def close(self, widget = None, event = None):
+        if self.api.is_running():
+            self.api.die()
+        self.window.close()
+    
+    def apply(self, widget):
+        self.save()
+        self.close()
+    
+    def save(self):
+        '''saves the entered data and closes the app'''
+        # Credentials
+        self.keys.delete_credentials(self.creds.username)
+        
+        user = self.input_user.get_text()
+        self.keys.set_credentials(user,
+                                  self.input_password.get_text())
+        
+        settings_provider = account_settings_provider.create_settings_provider(user)
+        # Mailboxes
+        labels = []
+        for label in self.wTree.get_object("entry_labels").get_text().split(","):
+            labels.append(label.strip())
+        settings_provider.save_labels(labels)
+        settings_provider.save_ignore_inbox(self.wTree.get_object("checkbutton_inbox").get_active())
+        
+        # ClickAction
+        settings_provider.save_use_mail_client(self.wTree.get_object("radiobutton_openclient").get_active())
+        
+        # Port
+        settings_provider.save_preferred_port(settings_provider.retrieve_preferred_port())
+        
+        # Soundfile
+        if self.wTree.get_object("checkbutton_sound").get_active() and self.wTree.get_object("fcbutton_sound").get_filename():
+            settings_provider.save_sound_enabled(True)
+            settings_provider.save_sound_file(str(self.wTree.get_object("fcbutton_sound").get_filename()))
+        else:
+            settings_provider.save_sound_enabled(False)
+
+    def on_checkbutton_sound_toggled(self, widget):
+        self.wTree.get_object("fcbutton_sound").set_sensitive(self.wTree.get_object("checkbutton_sound").get_active())
+    
+    def check_user(self, widget, event):
+        user = self.input_user.get_text()
+        if not self.has_mail_postfix(user):
+            self.input_user.set_text(user + "@gmail.com")
+    
+    def has_mail_postfix(self, user):
+        return len(user) == 0 or "@" in user
+    
+    def check_credentials(self, widget, event, data=None):
+        '''check if the given credentials are valid'''
+        
+        self.button_apply.set_sensitive(False)
+        
+        # Change status text and disable input fields
+        if self.input_user.get_text() and self.input_password.get_text():
+            self.image_credentials.set_from_file("/usr/share/gm-notify/checking.gif")
+            self.label_credentials.set_text(_("checking..."))
+            self.input_user.set_sensitive(False)
+            self.input_password.set_sensitive(False)
+            
+            self.api.jid = jid.JID(self.input_user.get_text())
+            self.api.password = self.input_password.get_text()
+            self.api.connect()
+        return False
+    
+    def credentials_valid(self, username):
+        self.on_credentials_checked("gtk-yes", "Valid credentials", True)
+
+    def credentials_invalid(self, username, reason):
+        self.on_credentials_checked("gtk-stop", "Invalid credentials")
+        
+    def connection_error(self, username, reason):
+        self.on_credentials_checked("gtk-stop", "Connection error")
+        
+    def on_credentials_checked(self, icon_name, text, valid = False):
+        self.image_credentials.set_from_icon_name(icon_name, Gtk.IconSize.MENU)
+        self.label_credentials.set_text(_(text))
+        self.input_user.set_sensitive(not bool(self.creds.username))
+        self.input_password.set_sensitive(True)
+        self.button_apply.set_sensitive(valid)
+
+        self.api.die()
+        
 \ No newline at end of file
 
=== added file 'account_settings_provider.py'
--- account_settings_provider.py	1970-01-01 00:00:00 +0000
+++ account_settings_provider.py	2015-12-05 00:25:32 +0000
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# settings_provider.py v0.10.3
+# Provides settins to GMail notify
+#
+# Copyright (c) 2015, Mateusz Balbus <[e-mail]>
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+from __future__ import print_function
+
+from gi.repository import Gio
+
+def create_settings_provider(username):
+    if username:
+        return AccountSettingsProvider(username)
+    else:
+        return DefaultSettingsProvider()
+
+class AccountSettingsProvider:
+    def __init__(self, username):
+        self.client = Gio.Settings("net.launchpad.gm-notify.account", "/net/launchpad/gm-notify/" + username + "/")
+    
+    def retrieve_sound_file(self, default_file = None):
+        soundfile = self.client.get_string("soundfile")
+        if soundfile == '':
+            soundfile = default_file
+        return soundfile
+
+    def retrieve_sound_enabled(self):
+        return self.client.get_boolean("play-sound")
+    
+    def retrieve_preferred_port(self):
+        return self.client.get_int("preferred-port")
+
+    def retrieve_ignore_inbox(self):
+        return self.client.get_boolean("ignore-inbox")
+
+    
+    def retrieve_labels(self):
+        return self.client.get_strv("labels")
+
+    
+    def retrieve_use_mail_client(self):
+        return self.client.get_boolean("openclient")
+
+    def save_labels(self, labels):
+        self.client.set_strv("labels", labels)
+
+    
+    def save_ignore_inbox(self, ignore_inbox):
+        self.client.set_boolean("ignore-inbox", ignore_inbox)
+
+    
+    def save_use_mail_client(self, use_mail_client):
+        self.client.set_boolean("openclient", use_mail_client)
+
+    
+    def save_sound_enabled(self, enabled):
+        self.client.set_boolean("play-sound", enabled)
+
+    
+    def save_sound_file(self, sound_file):
+        self.client.set_string("soundfile", sound_file)
+
+    
+    def save_preferred_port(self, preferred_port):
+        self.client.set_int("preferred-port", preferred_port)
+        
+    def remove_all_settings(self):
+        self.client.reset("")
+    
+class DefaultSettingsProvider:
+    def retrieve_sound_file(self, default_file = None):
+        return default_file
+
+    def retrieve_sound_enabled(self):
+        return False
+    
+    def retrieve_preferred_port(self):
+        return 443
+
+    def retrieve_ignore_inbox(self):
+        return False
+
+    def retrieve_labels(self):
+        return ''
+    
+    def retrieve_use_mail_client(self):
+        return False
+    
+    def save_labels(self, mailboxes):
+        raise NotImplementedError("Saving not supported") 
+
+    
+    def save_ignore_inbox(self, ignore_inbox):
+        raise NotImplementedError("Saving not supported")
+
+    
+    def save_use_mail_client(self, use_mail_client):
+        raise NotImplementedError("Saving not supported")
+
+    
+    def save_sound_enabled(self, enabled):
+        raise NotImplementedError("Saving not supported")
+
+    
+    def save_sound_file(self, sound_file):
+        raise NotImplementedError("Saving not supported")
+
+    
+    def save_preferred_port(self, preferred_port):
+        print("Ignoring save_preferred_port")
+
+    def remove_all_settings(self):
+        raise NotImplementedError("Removing not supported")
+
 
=== modified file 'data/net.launchpad.gm-notify.gschema.xml'
--- data/net.launchpad.gm-notify.gschema.xml	2015-12-05 00:25:32 +0000
+++ data/net.launchpad.gm-notify.gschema.xml	2015-12-05 00:25:32 +0000
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/net/launchpad/gm-notify/" id="net.launchpad.gm-notify" gettext-domain="gm-notify">
-    <key type="b" name="play-sound">
-      <default>false</default>
-      <summary>Shall we play a sound on new mail?</summary>
-    </key>
-    <key type="b" name="ignore-inbox">
-      <default>false</default>
-      <summary>If true, there won't be notifications regarding just your inbox.</summary>
-    </key>
-    <key type="s" name="soundfile">
-      <default>''</default>
-      <summary>Path to the soundfile which should be played when a new mail arrives</summary>
-    </key>
-    <key type="as" name="mailboxes">
-      <default>[]</default>
-      <summary>List containing mailboxes to check</summary>
-    </key>
-    <key type="b" name="openclient">
-      <default>false</default>
-      <summary>Shall we open the default mail client or webinterface?</summary>
-    </key>
-  </schema>
+    <schema id="net.launchpad.gm-notify.account" gettext-domain="gm-notify">
+        <key type="b" name="play-sound">
+            <default>false</default>
+            <summary>Shall we play a sound on new mail?</summary>
+        </key>
+        <key type="b" name="ignore-inbox">
+            <default>false</default>
+            <summary>If true, there won't be notifications regarding
+                just your
+                inbox.
+            </summary>
+        </key>
+        <key type="s" name="soundfile">
+            <default>''</default>
+            <summary>Path to the soundfile which should be played when a
+                new mail
+                arrives
+            </summary>
+        </key>
+        <key type="as" name="labels">
+            <default>[]</default>
+            <summary>List containing labels to check</summary>
+        </key>
+        <key type="b" name="openclient">
+            <default>false</default>
+            <summary>Shall we open the default mail client or
+                webinterface?
+            </summary>
+        </key>
+        <key type="i" name="preferred-port">
+            <default>443</default>
+            <summary>Port used to connect to Google services</summary>
+        </key>
+    </schema>
 </schemalist>
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-05-05 19:51:23 +0000
+++ debian/changelog	2015-12-05 00:25:32 +0000
@@ -1,3 +1,47 @@
+gm-notify (1.0.0-0ubuntu1) vivid; urgency=medium
+
+  * Added multi-account support
+  * Added support for multiple ports (default port 443)
+  * Added error messages
+  * Refactored the code
+  * Made app a single instance 
+
+ -- Mateusz Balbus <[e-mail]>  Thu, 15 Oct 2015 15:43:32 +0200
+
+gm-notify (0.10.3-0ubuntu3) trusty; urgency=low
+
+  * Convert to dh_python2.
+  * Wrap and sort.
+  * Bump Standards-Version to 3.9.4.
+  * Update copyright fields.
+
+ -- Logan Rosen <[e-mail]>  Tue, 19 Nov 2013 23:47:50 -0500
+
+gm-notify (0.10.3-0ubuntu2) trusty; urgency=low
+
+  * debian/control: Add missing dependency on
+    python-glade2 (LP: # 863855).
+  * debian/copyright: Tweak to bring up to latest
+    DEP-5 spec.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Sat, 01 Oct 2011 03:03:20 -0400
+
+gm-notify (0.10.3-0ubuntu1) maverick; urgency=low
+
+  * New upstream bug fix release.
+   - Fix CPU usage issue with subprocess.call. (LP: #616781)
+  * debian/patches/scripts-with-extensions-in-PATH:
+   - Drop, included upstream.
+  * debian/control: Bump Standards-Version to 3.9.1.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Sat, 18 Sep 2010 15:41:02 -0400
+
+gm-notify (0.10.2-0ubuntu1) maverick; urgency=low
+
+  * Initial release (LP: #596313).
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Thu, 01 Jul 2010 11:28:14 -0400
+
 gm-notify (0.10.2-1~ppa1) lucid; urgency=low
 
   * Release 0.10.2 / see http://bleedingpaper.com/gm-notify
 
=== modified file 'debian/compat'
--- debian/compat	2009-05-07 06:24:15 +0000
+++ debian/compat	2015-12-05 00:25:32 +0000
@@ -1,1 +1,1 @@
-7
+9
 
=== modified file 'debian/control'
--- debian/control	2010-04-21 11:56:58 +0000
+++ debian/control	2015-12-05 00:25:32 +0000
@@ -1,18 +1,31 @@
 Source: gm-notify
 Section: mail
 Priority: extra
-Maintainer: Ken VanDine <[e-mail]>
-XS-Python-Version: >= 2.6
-Build-Depends: cdbs, debhelper (>= 7), python-central (>= 0.6), python
-Standards-Version: 3.8.0
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Andrew Starr-Bochicchio <[e-mail]>
+X-Python-Version: >= 2.6
+Build-Depends: debhelper (>= 9),
+       dh-python,
+       python (>= 2.6.6-3~),
+       python-setuptools
+Standards-Version: 3.9.4
 Homepage: https://launchpad.net/gm-notify
 
 Package: gm-notify
 Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-indicate, python-notify, python-gst0.10, python-gtk2, python-gconf, python-twisted-words, python-gnomekeyring
 Provides: ${python:Provides}
-Description: GMail Notifier  
- A simple and lightweight highly Ubuntu 10.04 integrated GMail Notifier which 
- takes advantages of the new and nice notify-osd and indicator-applet.  
- Because of this it will not run with older Ubuntu versions.
+Depends: python-gconf,
+        python-glade2,
+        python-gnomekeyring,
+        python-gtk2,
+        python-indicate,
+        python-notify,
+        python-twisted-words,
+        gir1.2-gstreamer-1.0,
+        ${misc:Depends},
+        ${python:Depends},
+        ${shlibs:Depends}
+Description: Highly Ubuntu integrated GMail notifier
+ gm-notify is a simple, lightweight, and highly Ubuntu integrated
+ GMail notifier which takes advantages of features like notify-osd
+ and indicator-applet.
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-05-07 06:24:15 +0000
+++ debian/copyright	2015-12-05 00:25:32 +0000
@@ -1,19 +1,34 @@
-This package was debianized by Ken VanDine <[e-mail]> on
-Thu, 07 May 2009 01:39:52 -0400.
-
-It was downloaded from https://launchpad.net/gm-notify
-
-Upstream Author:
-
-    Alexander Hungenberg <[e-mail]>
-
-Copyright:
-
-    Copyright (c) 2009, Alexander Hungenberg <[e-mail]>
-
-License:
-
-    GPL-3
-
-The Debian packaging is copyright 2009, Ken VanDine <[e-mail]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gm-notify
+Source: https://launchpad.net/gm-notify
+Upstream-Contact: Alexander Hungenberg <[e-mail]>
+
+Files: *
+Copyright: 2009-2010, Alexander Hungenberg <[e-mail]>
+License: GPL-3+
+
+Files: po/*
+Copyright: 2009, Rosetta Contributors and Canonical Ltd.
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2009, Ken VanDine <[e-mail]>,
+           2010, Andrew Starr-Bochicchio <[e-mail]>
+License: GPL-3+
+
+License: GPL-3+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+    .
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    .
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    .
+    On Debian systems, see `/usr/share/common-licenses/GPL-3'.
 
=== modified file 'debian/rules'
--- debian/rules	2009-05-07 13:09:38 +0000
+++ debian/rules	2015-12-05 00:25:32 +0000
@@ -1,14 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pycentral
-export DH_PYCENTRAL=include-links
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-layout=deb
-
-# Add here any variable or target overrides you need.
-binary-post-install/gm-notify::
-	dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS)
+export PYBUILD_NAME=gm-notify
+%:
+	dh $@ --with python2 --buildsystem=pybuild
+
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-12-05 00:25:32 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'gm-config.ui'
--- gm-config.ui	2015-12-05 00:25:32 +0000
+++ gm-config.ui	2015-12-05 00:25:32 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="gmnotify_config_main">
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkWindow" id="gmnotify_add_account">
     <property name="can_focus">False</property>
     <property name="border_width">10</property>
     <property name="title" translatable="yes">GMail Notifier</property>
@@ -36,8 +37,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -49,8 +48,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -58,13 +55,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -73,14 +67,11 @@
                         <property name="can_focus">True</property>
                         <property name="visibility">False</property>
                         <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
                         <signal name="focus-out-event" handler="on_input_password_focus_out_event" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -92,8 +83,6 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -105,8 +94,6 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
@@ -329,44 +316,6 @@
                     <property name="position">2</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkFrame" id="frame_autostart">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="checkbutton_autostart">
-                            <property name="label" translatable="yes">Start automatically on logon</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Autostart:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">1</property>
 
=== added file 'gm-list.ui'
--- gm-list.ui	1970-01-01 00:00:00 +0000
+++ gm-list.ui	2015-12-05 00:25:32 +0000
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkListStore" id="accounts">
+    <columns>
+      <!-- column-name mail -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="gmnotify_config_main">
+    <property name="width_request">400</property>
+    <property name="height_request">250</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">10</property>
+    <property name="title" translatable="yes">GMail Notifier</property>
+    <property name="resizable">False</property>
+    <property name="window_position">center</property>
+    <property name="default_width">512</property>
+    <property name="default_height">512</property>
+    <property name="icon_name">evolution</property>
+    <property name="gravity">center</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="opacity">0.97999999999999998</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkNotebook" id="notebook_main">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">1</property>
+                <property name="margin_right">1</property>
+                <property name="margin_top">1</property>
+                <property name="margin_bottom">1</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkToolbar" id="add_remove_toolbar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="toolbar_style">both</property>
+                    <child>
+                      <object class="GtkToolButton" id="add_button">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_markup" translatable="yes">Add...</property>
+                        <property name="tooltip_text" translatable="yes">Add...</property>
+                        <property name="use_underline">True</property>
+                        <property name="stock_id">gtk-add</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolButton" id="remove_button">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="tooltip_markup" translatable="yes">Remove...</property>
+                        <property name="tooltip_text" translatable="yes">Remove...</property>
+                        <property name="use_underline">True</property>
+                        <property name="stock_id">gtk-remove</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTreeView" id="accounts_treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="margin_left">1</property>
+                    <property name="margin_right">1</property>
+                    <property name="margin_top">1</property>
+                    <property name="margin_bottom">1</property>
+                    <property name="hscroll_policy">natural</property>
+                    <property name="vscroll_policy">natural</property>
+                    <property name="model">accounts</property>
+                    <property name="search_column">1</property>
+                    <property name="show_expanders">False</property>
+                    <property name="enable_grid_lines">horizontal</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection">
+                        <property name="mode">browse</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn_name">
+                        <property name="sizing">fixed</property>
+                        <property name="title" translatable="yes">Accounts List</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext_name"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label_accounts">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Accounts</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame_autostart">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton_autostart">
+                        <property name="label" translatable="yes">Start automatically on logon</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="valign">start</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_autostart">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Autostart:&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label_preferences">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Preferences</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_ok">
+            <property name="label">gtk-ok</property>
+            <property name="width_request">100</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="halign">end</property>
+            <property name="valign">center</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="use_stock">True</property>
+            <property name="always_show_image">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
 
=== modified file 'gm-notify'
--- gm-notify	2015-12-05 00:25:32 +0000
+++ gm-notify	2015-12-05 00:25:32 +0000
@@ -1,10 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# gm-notify v0.10.3
+# gm-notify v1.0
 # a simple and lightweight GMail-Notifier for ubuntu and notify-osd
 #
 # Copyright (c) 2009-2010, Alexander Hungenberg <[e-mail]>
+# Copyright (c) 2015, Mateusz Balbus <[e-mail]>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +28,9 @@
 import gettext
 import webbrowser
 
-from gi.repository import Gio, GLib, MessagingMenu, Notify
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import Gio, GLib, Gst, MessagingMenu, Notify
 
 from twisted.internet import gireactor
 gireactor.install()
@@ -35,6 +38,7 @@
 from twisted.words.protocols.jabber import jid
 
 from gtalk import MailChecker
+import account_settings_provider
 import gm_notify_keyring as keyring
 
 _ = gettext.translation('gm-notify', fallback=True).ugettext
@@ -43,6 +47,10 @@
 
 MAILBOXES_URLS = {  "inbox": "" }
 
+GMAIL_DOMAINS = ['gmail.com','googlemail.com']
+
+EMAIL_RETRIEVAL_ERROR = "--retrieval-error"
+
 class PathNotFound(Exception): pass
 
 def get_executable_path(name):
@@ -54,28 +62,15 @@
     if os.path.exists(path) and os.access(path, os.X_OK): return path
     raise PathNotFound("%s not found" % name)
 
-def play_sound(name):
-    '''Spawns a canberra-gtk-play process to play the sound'''
-    if name is None:
-        return
-    player_path = "/usr/bin/canberra-gtk-play"
-    # Not installed?
-    if not os.path.exists(player_path):
-        return
-    command = [player_path]
-    # File exists, so use the file flag
-    if os.path.exists(name):
-        command.extend(["-f", name])
-    # Assume it is a sound id
-    else:
-        command.extend(["-i", name])
-    try:
-        result = GLib.spawn_async(command)
-    except:
-        return
-    # Does nothing but the documentation says to do it anyway
-    if len(result) > 0:
-        GLib.spawn_close_pid(result[0])
+class Account:
+    def __init__(self):
+        self.username = None
+        self.client = None
+        self.soundfile = None
+        self.ignore_inbox = None
+        self.domain = None
+        self.labels = None
+        self.use_mail_client = None
 
 class CheckMail(Gio.Application):
     def __init__(self):
@@ -84,14 +79,36 @@
         super(CheckMail, self).__init__(application_id="net.launchpad.gm-notify",
             flags=Gio.ApplicationFlags.FLAGS_NONE)
 
+        self.player = None
         self._has_activated = False
         self._counts = {}
         self.connect("activate", self.on_activate)
 
+    def play_sound(self, name):
+        '''Uses GSound to play the music'''
+        if name is None:
+            return
+        
+        if not self.player: 
+            Gst.init()
+            self.player = Gst.ElementFactory.make("playbin", "player")
+
+        self.player.set_property("uri", "file://" + name)
+        result = self.player.set_state(Gst.State.PLAYING)
+        if result == Gst.StateChangeReturn.FAILURE:
+            print("Unable to play " + name)
+
     def on_remote_quit(self, action, args):
         '''Stops the application when the "remote-quit" action is activated'''
         reactor.stop()
 
+    def run(self, args):
+        self.register();
+        if self.get_is_remote():
+            self.activate()
+        else:
+            super(CheckMail, self).run(args)
+
     def on_activate(self, app):
         '''When first receiving the activate signal, initialize the primary
         instance. On subsequent activate signals, we are being activated from a
@@ -113,8 +130,8 @@
             sys.exit(-1)
 
         keys = keyring.Keyring("GMail", "mail.google.com", "http")
-        if keys.has_credentials():
-            self.creds = keys.get_credentials()
+        if keys.has_any_credentials():
+            creds = keys.get_all_credentials()
         else:
             print("Failed to get credentials")
             # Start gm-notify-config if no credentials are found
@@ -122,110 +139,140 @@
                 subprocess.call(get_executable_path("gm-notify-config"))
             except PathNotFound:
                 print(_("gm-notify-config utility was not found"))
+
             sys.exit(-1)
         
-        # check if we use Google Apps to start the correct webinterface
-        gmail_domains = ['gmail.com','googlemail.com']
-        self.jid = jid.JID(self.creds[0])
-        if self.jid.host in gmail_domains:
-            self.domain = None
-        else:
-            self.domain = self.jid.host
-        
-        self.client = Gio.Settings("net.launchpad.gm-notify")
-        
-        # Set up the sound file
-        self._soundfile = self.client.get_string("soundfile")
-        if self._soundfile == '':
-            self._soundfile = "message-new-instant"
-        if not self.client.get_boolean("play-sound"):
-            self._soundfile = None
-
         # Messaging Menu integration
         self._m_menu = MessagingMenu.App.new("gm-notify.desktop")
         self._m_menu.register()
         self._m_menu.connect("activate-source", self.source_clicked)
 
-        # Read ignore-inbox value. If true you will only receive notifications
-        # about configured labels
-        self.ignore_inbox = self.client.get_boolean("ignore-inbox")
-        
-        # Retrieve the mailbox we're gonna check
-        self.mailboxes = self.client.get_strv("mailboxes")
-        self.mailboxes.insert(0, "inbox")
-        self.checker = MailChecker(self.jid, self.creds[1], self.mailboxes[1:], self.new_mail, self.update_count)
-        self.checker.connect()
-    
+        self.accounts = self.init_accounts(creds)
+
+
+    def init_accounts(self, creds):
+        accounts = {}
+        for credentails in creds:
+            account = Account()
+            account.username = credentails.username
+            local_jid = jid.JID(account.username)
+            # check if we use Google Apps to start the correct webinterface
+            if local_jid.host not in GMAIL_DOMAINS:
+                account.domain = local_jid.host
+            
+            client = account_settings_provider.create_settings_provider(account.username)
+            account.client = client 
+            
+            account.use_mail_client = client.retrieve_use_mail_client()
+            
+            # Set up the sound file
+            if client.retrieve_sound_enabled():
+                account.soundfile = client.retrieve_sound_file("message-new-instant")
+            # Read ignore-inbox value. If true you will only receive notifications
+            # about configured labels
+            account.ignore_inbox = client.retrieve_ignore_inbox()
+            
+            # Retrieve the mailbox we're gonna check
+            account.labels = client.retrieve_labels()
+            account.labels.insert(0, "inbox")
+            account.checker = MailChecker(local_jid, credentails.password, client, account.labels[1:], self.new_mail, self.update_count)
+            account.checker.setOnConnectionErrorCB(self.checker_connection_error)
+            account.checker.setOnAuthFailed(self.checker_auth_failed)
+            account.checker.setOnAuthSucceeded(self.checker_auth_succeeded)
+            account.checker.connect()
+            
+            accounts[credentails.username] = account
+        return accounts
+
     def indicator_clicked(self):
         '''called when "Google Mail" is clicked in indicator-messages and
         performs a Mail Check'''
-        for label in self.mailboxes:
-            self.remove_attention(label)
-        
-        self.checker.queryInbox()
+        for username, account in self.accounts.items():
+            for label in account.labels:
+                self.remove_attention(self.compose_id(username, label))
+            
+        for username, account in self.accounts.items():
+            account.checker.queryInbox()
+
+    def compose_label(self, username, label):
+        return "%s (%s)" % (username, label)
+
+    def compose_id(self, username, label):
+        return "%s&%s" % (username, label)
+    
+    def decompose_id(self, id):
+        decomposed = id.split("&")
+        return (decomposed[0], decomposed[1])
 
     def remove_attention(self, label):
         '''Removes attention from the label source if it exists'''
         if self._m_menu.has_source(label):
             self._m_menu.remove_attention(label)
 
-    def has_source(self, label):
+    def has_source(self, username, label):
         '''Returns true if we have this label, or if we don't and it is in our
         mailboxes list, create it'''
-        if label == "inbox" and self.ignore_inbox:
+        account = self.accounts[username]
+        if label == "inbox" and account.ignore_inbox:
             return False
-        elif label in self.mailboxes:
-            if not self._m_menu.has_source(label):
+        elif label in account.labels:
+            mail_label = self.compose_id(username, label)
+            if not self._m_menu.has_source(mail_label):
                 if label in MAILBOXES_NAMES:
                     name = MAILBOXES_NAMES[label]
                 else:
                     name = label
+                name_label = self.compose_label(username, name)
                 if label == "inbox":
-                    self._m_menu.insert_source_with_string(0, label, None, name, _("empty"))
+                    self._m_menu.insert_source_with_string(0, mail_label, None, name_label, _("empty"))
                 else:
-                    self._m_menu.append_source_with_string(label, None, name, _("empty"))
-                if label in self._counts:
-                    self._m_menu.set_source_count(label, self._counts[label])
+                    self._m_menu.append_source_with_string(mail_label, None, name_label, _("empty"))
+                if mail_label in self._counts:
+                    self._m_menu.set_source_count(mail_label, self._counts[mail_label])
             return True
         else:
             return False
     
-    def update_count(self, count):
+    def update_count(self, username, count):
         '''Updates the count for all the mailboxes'''
+        account = self.accounts[username]
         for mailbox in count.iteritems():
-            if mailbox[0] == "inbox" and self.ignore_inbox:
+            if mailbox[0] == "inbox" and account.ignore_inbox:
                 continue
             
-            if self.has_source(mailbox[0]):
+            if self.has_source(username, mailbox[0]):
                 # Get the last count
                 last_count = 0
-                if mailbox[0] in self._counts:
-                    last_count = self._counts[mailbox[0]]
+                mail_label = self.compose_id(username, mailbox[0])
+                if mail_label in self._counts:
+                    last_count = self._counts[mail_label]
                 current_count = int(mailbox[1])
 
                 # Remove attention if the count has decreased
                 if last_count > current_count:
-                    self._m_menu.remove_attention(mailbox[0])
+                    self._m_menu.remove_attention(mail_label)
                 if current_count > 0:
-                    self._m_menu.set_source_count(mailbox[0], current_count)
+                    self._m_menu.set_source_count(mail_label, current_count)
                 # Remove the source if 0 messages, to save space
                 else:
-                    self._m_menu.remove_source(mailbox[0])
-                self._counts[mailbox[0]] = current_count
+                    self._m_menu.remove_source(mail_label)
+                self._counts[mail_label] = current_count
     
-    def new_mail(self, mails):
+    def new_mail(self, username, mails):
         '''Takes mailbox name and titles of mails, to display notification and add indicators'''
+        account = self.accounts[username]
         text = ""
         # aggregate the titles of the messages... cut the string if longer than 30 chars
         for mail in mails:
             got_label = False
             for label in mail['labels']:
                 if label == u"^i": label = "inbox"
-                if label == "inbox" and self.ignore_inbox:
+                if label == "inbox" and account.ignore_inbox:
                     continue
-                if self.has_source(label):
+                if self.has_source(username, label):
                     got_label = True
-                    self._m_menu.draw_attention(label)
+                    mail_label = self.compose_id(username, label)
+                    self._m_menu.draw_attention(mail_label)
             if not got_label: continue
             
             if "sender_name" in mail: text += mail['sender_name'] + ":\n"
@@ -242,32 +289,75 @@
             text += "- " + title + "\n"
             
         if text:
-            self.showNotification(_("Incoming message"), text.strip("\n"))
-            play_sound(self._soundfile)
+            self.show_notification("{0}".format(username), text.strip("\n"))
+            self.play_sound(self.accounts[username].soundfile)
     
     def source_clicked(self, app, source_id):
         '''called when a label is clicked in the indicator-applet and opens the corresponding gmail page'''
-        if self.domain:
-            url = "https://mail.google.com/a/"+self.domain+"/"
-        else:
-            url = "https://mail.google.com/mail/"
-        
-        try:
-            url += "#%s" % MAILBOXES_URLS[source_id]
-        except KeyError:
-            url += "#label/%s" % source_id
+        # TODO: missing username
+        username, label = self.decompose_id(source_id)
+        if label == EMAIL_RETRIEVAL_ERROR:
+            return
+        account = self.accounts[username]
         
         # Open mail client
-        if self.client.get_boolean("openclient"):
+        if account.use_mail_client:
             try:
                 info = Gio.AppInfo.get_default_for_type("x-scheme-handler/mailto", False)
                 info.launch(None, None)
             except:
                 pass
         else:
+            url = self.prep_url(account, label)
             webbrowser.open(url)
 
-    def showNotification(self, title, message):
+    def prep_url(self, account, label):
+        url_domain = self.prep_url_domain(account.domain)
+        url_label = self.prep_url_label(label)
+
+        return ("https://accounts.google.com/AccountChooser?"
+                "Email={0}"
+                "&continue=https%3A%2F%2Fmail.google.com%2Fmail%2F{1}"
+                "&service=mail"
+                "&hd={2}").format(account.username, url_label, url_domain)
+
+    def prep_url_label(self, label):
+        if label in MAILBOXES_URLS:
+            return "%23{0}".format(MAILBOXES_URLS[label])
+        else:
+            return "%23label%2F{0}".format(label)
+
+    def prep_url_domain(self, domain):
+        if domain:
+            return domain
+        else:
+            return "default"
+    
+    def checker_auth_succeeded(self, username):
+        error_label = self.compose_id(username, EMAIL_RETRIEVAL_ERROR)
+        self._m_menu.remove_source(error_label)
+    
+    def checker_connection_error(self, username, error): 
+        self.check_failed(username, _("Cannot retrieve emails"))
+    
+    def checker_auth_failed(self, username, error):
+        self.check_failed(username, _("Authentication failed"))
+    
+    def check_failed(self, username, feed):
+        
+        for id in self._counts:
+            local_username, local_label = self.decompose_id(id)
+            if local_username == username:
+                self._m_menu.remove_source(id)
+            
+        error_id = self.compose_id(username, EMAIL_RETRIEVAL_ERROR)
+        if self._m_menu.has_source(error_id):
+            return
+        self._m_menu.append_source(error_id, None, username + _(" - Cannot retrieve emails"))
+        n = Notify.Notification.new(_("Error for ") + username, feed, "messagebox_critical")
+        n.show()
+    
+    def show_notification(self, title, message):
         '''takes a title and a message to display the email notification. Returns the
         created notification object'''
         
@@ -276,6 +366,13 @@
         
         return n
     
+    def shutdown(self):
+        if self.accounts: 
+            for username, account in self.accounts.items():
+                if account.checker : account.checker.die()
+    
 cm = CheckMail()
 reactor.registerGApplication(cm)
+reactor.addSystemEventTrigger('before', 'shutdown', cm.shutdown)
 reactor.run()
+
 
=== modified file 'gm-notify-config'
--- gm-notify-config	2015-12-05 00:25:32 +0000
+++ gm-notify-config	2015-12-05 00:25:32 +0000
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# gm-notify-config v0.10.3
+# gm-notify-config v1.0
 # GMail Notifier Configuration Utility
 #
 # Copyright (c) 2009-2010, Alexander Hungenberg <[e-mail]>
+# Copyright (c) 2015, Mateusz Balbus <[e-mail]>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,15 +28,17 @@
 import subprocess
 import shutil
 
-from gi.repository import Gio, Gtk
+from gi.repository import Gio, Gtk, Gdk
 
 from twisted.internet import gtk3reactor
 gtk3reactor.install()
 from twisted.internet import reactor
-from twisted.words.protocols.jabber import jid
 
 import gm_notify_keyring as keyring
-from gtalk import MailChecker
+from gm_notify_keyring import Credentials
+from account_config import AccountConfig
+import account_settings_provider 
+ 
 
 _ = gettext.translation('gm-notify', fallback=True).ugettext
 
@@ -57,6 +60,13 @@
         self.window = None
         self.connect("activate", self.on_activate)
 
+    def run(self, args):
+        self.register();
+        if self.get_is_remote():
+            self.activate()
+        else:
+            super(Window, self).run(args)
+
     def on_activate(self, app):
         '''Setup the application'''
         if self.window is not None:
@@ -66,59 +76,39 @@
         # GUI initialization
         #####
         self.keys = keyring.Keyring("GMail", "mail.google.com", "http")
-        self.client = Gio.Settings("net.launchpad.gm-notify")
         
-        if os.path.exists("gm-config.ui"):
-            builder_file = "gm-config.ui"
-        elif os.path.exists("/usr/local/share/gm-notify/gm-config.ui"):
-            builder_file = "/usr/local/share/gm-notify/gm-config.ui"
-        elif os.path.exists("/usr/share/gm-notify/gm-config.ui"):
-            builder_file = "/usr/share/gm-notify/gm-config.ui"
+        if os.path.exists("gm-list.ui"):
+            builder_file = "gm-list.ui"
+        elif os.path.exists("/usr/local/share/gm-notify/gm-list.ui"):
+            builder_file = "/usr/local/share/gm-notify/gm-list.ui"
+        elif os.path.exists("/usr/share/gm-notify/gm-list.ui"):
+            builder_file = "/usr/share/gm-notify/gm-list.ui"
+
 
         self.wTree = Gtk.Builder.new()
         self.wTree.add_from_file(builder_file)
         self.wTree.set_translation_domain("gm-notify")
         self.window = self.wTree.get_object("gmnotify_config_main")
         self.window.show_all()
+        self.window.connect("delete_event", self.terminate)
+        self.window.connect("window-state-event", self.on_update_accounts)
         self.add_window(self.window)
+        
+        self.accounts = self.wTree.get_object("accounts")
 
+        self.accounts_treeview = self.wTree.get_object("accounts_treeview")
+        self.accounts_treeview.connect("row-activated", self.on_modify_account);
+        
         self.wTree.get_object("notebook_main").set_current_page(0)
         
-        #####
-        # Init with stored values
-        #####
-        
-        # Credentials
-        if self.keys.has_credentials():
-            self.creds = self.keys.get_credentials()
-        else:
-            self.creds = ("", "")
-        self.wTree.get_object("input_user").set_text(self.creds[0])
-        self.wTree.get_object("input_password").set_text(self.creds[1])
-        
-        self.api = MailChecker("", "")
-        self.api.cb_auth_successful = self.credentials_valid
-        self.api.cb_auth_failed = self.credentials_invalid
-        
-        self.check_credentials(None, None)
-        
-        # Sound
-        self.wTree.get_object("checkbutton_sound").set_active(self.client.get_boolean("play-sound"))
-        if self.client.get_string("soundfile"):
-            self.wTree.get_object("fcbutton_sound").set_filename(self.client.get_string("soundfile"))
-        self.on_checkbutton_sound_toggled(self.wTree.get_object("checkbutton_sound"))
-        
-        # ClickAction
-        if self.client.get_boolean("openclient"):
-            self.wTree.get_object("radiobutton_openclient").set_active(True)
-        else:
-            self.wTree.get_object("radiobutton_openweb").set_active(True)
-        
-        # Mailboxes
-        mailboxes = self.client.get_strv("mailboxes")
-        self.wTree.get_object("checkbutton_inbox").set_active(self.client.get_boolean("ignore-inbox"))
-        self.wTree.get_object("entry_labels").set_text(", ".join(mailboxes))
+        
+        self.add_button = self.wTree.get_object("add_button")
+        self.add_button.connect("clicked", self.on_add_account)
 
+        self.remove_button = self.wTree.get_object("remove_button")
+        self.remove_button.connect("clicked", self.on_remove_account)
+        
+        self.wTree.get_object("button_ok").connect("clicked", self.terminate)
         # Autorun
         if os.path.exists("data/gm-notify.desktop"):
             self.gm_notify_autostart_file = "data/gm-notify.desktop"
@@ -129,36 +119,48 @@
         self.autostart_file = os.path.expanduser("~/.config/autostart/gm-notify.desktop")
         self.wTree.get_object("checkbutton_autostart").set_active(os.path.exists(self.autostart_file))
         
-        # Connect signals
-        self.wTree.get_object("button_close").connect("clicked", self.terminate)
-        self.wTree.get_object("button_apply").connect("clicked", self.save)
-        self.wTree.get_object("input_password").connect("focus-out-event", self.check_credentials)
-        self.wTree.get_object("checkbutton_sound").connect("toggled", self.on_checkbutton_sound_toggled)
-    
+    def update_accounts(self, accounts, keys):
+        accounts.clear()
+        if not self.keys.has_any_users():
+            return
+        for user in keys.get_all_users():
+            accounts.append((user,))
+    
+    def on_update_accounts(self, widget, event):
+        print("Event %s WindowState %s" % (str(event.type), str(event.new_window_state)))
+        if (event.type == Gdk.EventType.WINDOW_STATE
+            and event.new_window_state == Gdk.WindowState.FOCUSED):
+            self.update_accounts(self.accounts, self.keys)
+    
+    def on_modify_account(self, widget, path, column):
+        iter = self.accounts.get_iter(path)
+        account = self.accounts[iter]
+        username = account[0]
+        credentials = self.keys.get_credentials(username)
+        account_config = AccountConfig(self.keys, credentials)
+        window = account_config.init_window(self.window)
+    
+    def on_add_account(self, widget):
+        account_config = AccountConfig(self.keys, Credentials())
+        window = account_config.init_window(self.window)
+    
+    def on_remove_account(self, widget):
+        tree_selection = self.accounts_treeview.get_selection()
+        accounts,iter = tree_selection.get_selected()
+        if iter is None:
+            return
+        
+        account = accounts[iter]
+        username = account[0]
+        settings_provider = account_settings_provider.create_settings_provider(username)
+        settings_provider.remove_all_settings()
+        self.keys.delete_credentials(username)
+        
+        accounts.remove(iter)
+        
     def save(self, widget, data=None):
         '''saves the entered data and closes the app'''
-        # Credentials
-        self.keys.delete_credentials()
-        self.keys.set_credentials(self.wTree.get_object("input_user").get_text(),
-                                  self.wTree.get_object("input_password").get_text())
-        
-        # Mailboxes
-        mailboxes = []
-        for label in self.wTree.get_object("entry_labels").get_text().split(","):
-            mailboxes.append(label.strip())
-        self.client.set_strv("mailboxes", mailboxes)
-        self.client.set_boolean("ignore-inbox", self.wTree.get_object("checkbutton_inbox").get_active())
-        
-        # ClickAction
-        self.client.set_boolean("openclient", self.wTree.get_object("radiobutton_openclient").get_active())
-
-        # Soundfile
-        if self.wTree.get_object("checkbutton_sound").get_active() and self.wTree.get_object("fcbutton_sound").get_filename():
-            self.client.set_boolean("play-sound", True)
-            self.client.set_string("soundfile", str(self.wTree.get_object("fcbutton_sound").get_filename()))
-        else:
-            self.client.set_boolean("play-sound", False)
-
+        
         # Autorun
         if self.wTree.get_object("checkbutton_autostart").get_active():
             if not os.path.exists(self.autostart_file):
@@ -182,62 +184,9 @@
         # Start gm-notify itself
         subprocess.Popen(get_executable_path("gm-notify"))
     
-    def terminate(self, widget):
+    def terminate(self, widget, event = None):
         reactor.stop()
     
-    def on_checkbutton_sound_toggled(self, widget):
-        self.wTree.get_object("fcbutton_sound").set_sensitive(self.wTree.get_object("checkbutton_sound").get_active())
-    
-    def check_credentials(self, widget, event, data=None):
-        '''check if the given credentials are valid'''
-        
-        input_user = self.wTree.get_object("input_user")
-        input_password = self.wTree.get_object("input_password")
-        image_credentials = self.wTree.get_object("image_credentials")
-        label_credentials = self.wTree.get_object("label_credentials")
-        button_apply = self.wTree.get_object("button_apply")
-        button_apply.set_sensitive(False)
-        
-        # Change status text and disable input fields
-        if input_user.get_text() and input_password.get_text():
-            image_credentials.set_from_file("/usr/share/gm-notify/checking.gif")
-            label_credentials.set_text(_("checking..."))
-            input_user.set_sensitive(False)
-            input_password.set_sensitive(False)
-            
-            self.api.jid = jid.JID(input_user.get_text())
-            self.api.password = input_password.get_text()
-            self.api.connect()
-        return False
-    
-    def credentials_valid(self):
-        input_user = self.wTree.get_object("input_user")
-        input_password = self.wTree.get_object("input_password")
-        image_credentials = self.wTree.get_object("image_credentials")
-        label_credentials = self.wTree.get_object("label_credentials")
-        button_apply = self.wTree.get_object("button_apply")
-        
-        image_credentials.set_from_icon_name("gtk-yes", Gtk.IconSize.MENU)
-        label_credentials.set_text(_("Valid credentials"))
-        button_apply.set_sensitive(True)
-        input_user.set_sensitive(True)
-        input_password.set_sensitive(True)
-        
-        self.api.die()
-    
-    def credentials_invalid(self):
-        input_user = self.wTree.get_object("input_user")
-        input_password = self.wTree.get_object("input_password")
-        image_credentials = self.wTree.get_object("image_credentials")
-        label_credentials = self.wTree.get_object("label_credentials")
-        
-        image_credentials.set_from_icon_name("gtk-stop", Gtk.IconSize.MENU)
-        label_credentials.set_text(_("Invalid credentials"))
-        input_user.set_sensitive(True)
-        input_password.set_sensitive(True)
-        
-        self.api.die()
-
 t = Window()
 reactor.registerGApplication(t)
 reactor.run()
 
=== modified file 'gm_notify_keyring.py'
--- gm_notify_keyring.py	2015-12-05 00:25:32 +0000
+++ gm_notify_keyring.py	2015-12-05 00:25:32 +0000
@@ -3,6 +3,9 @@
 __version__ = "$Revision: 14294 $"
 
 from gi.repository import GnomeKeyring, Gtk
+from collections import namedtuple
+Credentials = namedtuple("Credentials", ["username", "password"])
+Credentials.__new__.__defaults__ = ("", "")
 
 def attributes(d):
     '''Converts a dictionary to a GnomeKeyring.Attribute array'''
@@ -28,26 +31,66 @@
         self._protocol = protocol
         result, self._keyring = GnomeKeyring.get_default_keyring_sync()
     
-    def has_credentials(self):
+    def has_any_credentials(self):
         attrs = attributes({"server": self._server, "protocol": self._protocol})
         result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
         if result in (GnomeKeyring.Result.NO_MATCH, GnomeKeyring.Result.DENIED):
             return False
         return len(items) > 0
 
-    def get_credentials(self):
-        attrs = attributes({"server": self._server, "protocol": self._protocol})
+    def get_all_credentials(self):
+        attrs = attributes({"server": self._server, "protocol": self._protocol})
+        result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
+        if len(items) == 0:
+            raise KeyringException("Credentials not found")
+        credentials_list = []
+        for item in items:
+            d = dict_from_attributes(item.attributes)
+            credentials_list.append(Credentials(d["user"], item.secret))
+        return credentials_list
+    
+    def has_any_users(self):
+        return self.has_any_credentials()
+    
+    def get_all_users(self):
+        attrs = attributes({"server": self._server, "protocol": self._protocol})
+        result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
+        if len(items) == 0:
+            raise KeyringException("Credentials not found")
+        users_list = []
+        for item in items:
+            d = dict_from_attributes(item.attributes)
+            users_list.append(d["user"])
+        return users_list
+    
+    def get_credentials(self, user):
+        attrs = attributes({
+                            "user" : user,
+                            "server": self._server,
+                            "protocol": self._protocol
+                            })
         result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
         if len(items) == 0:
             raise KeyringException("Credentials not found")
         d = dict_from_attributes(items[0].attributes)
-        return (d["user"], items[0].secret)
+        return Credentials(d["user"], items[0].secret) 
     
-    def delete_credentials(self):
+    def delete_all_credentials(self):
         attrs = attributes({"server": self._server, "protocol": self._protocol})
         result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
         for item in items:
             GnomeKeyring.item_delete_sync(self._keyring, item.item_id)
+
+    def delete_credentials(self, user):
+        attrs = attributes({
+                            "user": user,
+                            "server": self._server,
+                            "protocol": self._protocol
+                            })
+        result, items = GnomeKeyring.find_items_sync(GnomeKeyring.ItemType.NETWORK_PASSWORD, attrs)
+        for item in items:
+            GnomeKeyring.item_delete_sync(self._keyring, item.item_id)
+
     
     def set_credentials(self, user, pw):
         attrs = attributes({
 
=== modified file 'gtalk.py'
--- gtalk.py	2015-12-05 00:25:32 +0000
+++ gtalk.py	2015-12-05 00:25:32 +0000
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# gtalk.py v0.10.3
+# gtalk.py v1.0
 # Google Talk mail notification client library
 #
 # Copyright (c) 2009-2010, Alexander Hungenberg <[e-mail]>
+# Copyright (c) 2015, Mateusz Balbus <[e-mail]>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,38 +22,86 @@
 #
 from __future__ import print_function
 
-from threading import Event
-
 from twisted.words.protocols.jabber import xmlstream, client, jid
 from twisted.words.xish import domish
-from twisted.internet import reactor, task, error
-
-_DEBUG = False
+from twisted.internet import reactor, task, error, ssl
+from twisted.internet.error import TimeoutError, ConnectionRefusedError
+
+from datetime import datetime
+
+GTALK_HOST = "talk.google.com"
+
+_DEBUG = True
 COLOR_GREEN = "\033[92m"
 COLOR_END = "\033[0m"
 def DEBUG(msg):
-    if _DEBUG: print(COLOR_GREEN + str(msg) + COLOR_END)
+    if _DEBUG:
+        curent_time = datetime.now()
+ 
+        print(COLOR_GREEN + str(curent_time) + " " +str(msg) + COLOR_END)
 
 class GTalkClientFactory(xmlstream.XmlStreamFactory):
-    def __init__(self, jid, password):
+    
+    def __init__(self, jid, password, settings_provider):
         a = client.XMPPAuthenticator(jid, password)
         xmlstream.XmlStreamFactory.__init__(self, a)
+        self.addBootstrap(xmlstream.STREAM_CONNECTED_EVENT, self.clientConnected)
         
+        self.jid = jid
         self.reconnect = True
+        self.connection_failed = False
+        self.connection_lost = False
+        self.cb_connection_error = None
+        self.settings_provider = settings_provider
+        self.port = self.settings_provider.retrieve_preferred_port()
     
     def clientConnectionLost(self, connector, reason):
-        if self.reconnect: xmlstream.XmlStreamFactory.clientConnectionLost(self, connector, reason)
+        DEBUG("clientConnectionLost %s" % str(reason))
+        self.connection_lost = True
+        if not self.reconnect:
+            return
+        
+        DEBUG("clientConnectionLost: Reconnecting with the same settings (port %d)" % connector.port)
+        if self.cb_connection_error : self.cb_connection_error(self.jid.full(), reason)
+        # reconnect on the same port as it used to work
+        xmlstream.XmlStreamFactory.clientConnectionLost(self, connector, reason)
+         
+    def clientConnectionFailed(self, connector, reason):
+        DEBUG("clientConnectionFailed %s on port: %d reconnecting: %s" % (str(reason), connector.port, str(self.reconnect)))
+        self.connection_failed = True
+        if not self.reconnect:
+            return
+        
+        DEBUG("clientConnectionFailed: Connection failed");
+        if self.cb_connection_error : self.cb_connection_error(self.jid.full(), reason)
+    
+    def clientConnected(self, xmlstream):
+        DEBUG("clientConnected") 
+        self.connection_failed = False
+        self.connection_lost = False
+    
+    def getCurrentPort(self):
+        return self.port
+    
+    def hasConnectionFailedOrLost(self):
+        return self.connection_failed or self.connection_lost
+    
+    def setOnConnectionErrorCB(self, cb_connection_error):
+        self.cb_connection_error = cb_connection_error
+
 
 class MailChecker():
-    def __init__(self, jid, password, labels=[], cb_new=None, cb_count=None):
-        self.host = "talk.google.com"
-        self.port = 5222
+    def __init__(self, jid, password, settings_provider, labels=[], cb_new=None, cb_count=None):
+        self.host = GTALK_HOST
+        self.settings_provider = settings_provider
         self.jid = jid
         self.password = password
         self.cb_new = cb_new
         self.cb_count = cb_count
-        self.cb_auth_successful = None
+        self.cb_auth_succeeded = None
         self.cb_auth_failed = None
+        self.cb_connection_error = None
+        self.cb_connected = None
         
         self.last_tids = {}
         self.labels = labels
@@ -66,14 +115,33 @@
         self.ready_for_query_state = False
         self.timeout_call_id = None
         self.disconnected = True
+        self.running = False
+    
+    def setOnConnectionErrorCB(self, cb_connection_error):
+        self.cb_connection_error = cb_connection_error
+    
+    def setOnConnectedCB(self, cb_connected):
+        self.cb_connected = cb_connected
+        
+    def setOnAuthFailed(self, cb_auth_failed):
+        self.cb_auth_failed = cb_auth_failed
+
+    def setOnAuthSucceeded(self, cb_auth_succeeded):
+        self.cb_auth_succeeded = cb_auth_succeeded
+    
+    def is_running(self):
+        return self.running
     
     def die(self):
+        DEBUG("Dying...")
         self.factory.reconnect = False
         self.query_task.stop()
         self.connector.disconnect()
+        self.running = False
     
     def connect(self):
-        self.factory = GTalkClientFactory(self.jid, self.password)
+        self.factory = GTalkClientFactory(self.jid, self.password, self.settings_provider)
+        self.factory.setOnConnectionErrorCB(self.cb_connection_error)
         self.factory.addBootstrap(xmlstream.STREAM_END_EVENT, self.disconnectCB)
         self.factory.addBootstrap(xmlstream.STREAM_ERROR_EVENT, self.disconnectCB)
         self.factory.addBootstrap(xmlstream.INIT_FAILED_EVENT, self.init_failedCB)
@@ -84,10 +152,12 @@
         
         self.query_task = task.LoopingCall(self.queryInbox)
         self.query_task.start(60)
+        self.running = True
         
-        self.connector = reactor.connectTCP(self.host, self.port, self.factory)
+        self.connector = reactor.connectSSL(self.host, self.factory.getCurrentPort(), self.factory, ssl.ClientContextFactory())
     
     def reply_timeout(self):
+        DEBUG("reply_timeout")
         self.connector.disconnect() # Our reconnecting factory will try the reconnecting
 
     def send_callback_handler(self, data, callback=None, **kargs):
@@ -115,16 +185,19 @@
         self.xmlstream.send(data)
     
     def disconnectCB(self, xmlstream):
-        self.ready_for_query_state = False
-        self.disconnected = True
         DEBUG("disconnected")
-    
+        self.ready_for_query_state = False
+        self.factory.reconnect = False
+        self.disconnected = True
+
     def init_failedCB(self, xmlstream):
-        if self.cb_auth_failed: self.cb_auth_failed()
+        DEBUG("init_failedCB")
+        if self.cb_auth_failed: self.cb_auth_failed(self.jid.full(), xmlstream.value)
         self.disconnectCB(xmlstream)
     
     def authenticationCB(self, xmlstream):
-        if self.cb_auth_successful: self.cb_auth_successful()
+        DEBUG("authenticationCB")
+        if self.cb_auth_succeeded: self.cb_auth_succeeded(self.jid.full())
         self.factory.resetDelay()
         
         # We set the usersetting mail-notification
@@ -135,12 +208,19 @@
         self.send(iq, "/iq", self.usersettingIQ)
     
     def usersettingIQ(self, iq):
+        DEBUG("usersettingIQ")
         self.ready_for_query_state = True
         self.queryInbox()
     
     def queryInbox(self):
-        if not self.ready_for_query_state: return
+        DEBUG("queryInbox")
+        if not(self.ready_for_query_state or self.factory.hasConnectionFailedOrLost()):
+            DEBUG("queryInbox: ready for query: %s connection_failed_or_lost: %s" % (str(self.ready_for_query_state), str(self.factory.hasConnectionFailedOrLost())))
+            DEBUG("queryInbox: skipping query request")
+            return
         if self.disconnected:
+            DEBUG("queryInbox: disconnected")
+            self.factory.reconnect = True
             self.connector.connect()
             return
         self.ready_for_query_state = False
@@ -149,21 +229,23 @@
         
         iq = domish.Element((None, "iq"), attribs={"type": "get", "id": "mail-request-1"})
         query = iq.addElement(("google:mail:notify", "query"))
+        DEBUG("queryInbox: requesting for label")
         self.send(iq, "/iq", self.gotLabel)
     
     def queryLabel(self):
         try:
             label = self.labels_iter.next()
-            
+            DEBUG("queryLabel " + label)
             iq = domish.Element((None, "iq"), attribs={"type": "get", "id": "mail-request-1"})
             query = iq.addElement(("google:mail:notify", "query"))
             query.attributes['q'] = "label:%s AND is:unread" % label
             self.send(iq, "/iq", self.gotLabel, label=label)
         except StopIteration:
+            DEBUG("queryLabel: end of iteration")
             self.labels_iter = iter(self.labels)
             self.xmlstream.addObserver("/iq", self.gotNewMail)
-            if self.cb_count: self.cb_count(self.count)
-            if self.mails and self.cb_new: self.cb_new(self.mails)
+            if self.cb_count: self.cb_count(self.jid.full(), self.count)
+            if self.mails and self.cb_new: self.cb_new(self.jid.full(), self.mails)
             self.mails = []
             self.ready_for_query_state = True
     
@@ -242,21 +324,25 @@
                             mail['snippet'] = unicode(child)
                     mails.append(mail)
                 
-                self.cb_new(mails)
+                self.cb_new(self.jid.full(), mails)
         
         self.ready_for_query_state = True
         if iq: self.queryInbox()
     
     def rawDataIn(self, buf):
-        print(u"< %s" % unicode(buf, "utf-8"))
+        print("> %s" % buf)
     
     def rawDataOut(self, buf):
-        print(u"> %s" % unicode(buf, "utf-8"))
+        print("< %s" % buf)
     
     def connectedCB(self, xmlstream):
         self.xmlstream = xmlstream
         self.disconnected = False
+        if self.cb_connected: self.cb_connected(self.jid.full())
         
         if _DEBUG:
             xmlstream.rawDataInFn = self.rawDataIn
             xmlstream.rawDataOutFn = self.rawDataOut
+            
+    def getCurrentPort(self):
+        return self.factory.getCurrentPort()
 
=== modified file 'setup.py'
--- setup.py	2015-12-05 00:25:32 +0000
+++ setup.py	2015-12-05 00:25:32 +0000
@@ -3,16 +3,17 @@
 from distutils.core import setup
 
 setup(  name='gm-notify',
-        version='0.10.3',
+        version='1.0.0',
         description='Highly Ubuntu integrated GMail Notifier',
-        author='Alexander Hungenberg',
-        author_email='[e-mail]',
-        py_modules=['gtalk', 'gm_notify_keyring'],
+        author='Mateusz Balbus',
+        author_email='[e-mail]',
+        py_modules=['gtalk', 'gm_notify_keyring', 'account_settings_provider', 'account_config'],
         scripts=['gm-notify', 'gm-notify-config'],
         data_files=[('/usr/share/applications', ['data/gm-notify-config.desktop']),
                     ('/usr/share/applications', ['data/gm-notify.desktop']),
                     ('/usr/share/gm-notify', ['data/checking.gif']),
                     ('/usr/share/gm-notify', ['gm-config.ui']),
+                    ('/usr/share/gm-notify', ['gm-list.ui']),
                     ('/usr/share/glib-2.0/schemas', ['data/net.launchpad.gm-notify.gschema.xml']),
                     ('/usr/share/locale/da/LC_MESSAGES', ['po/da/gm-notify.mo']),
                     ('/usr/share/locale/bg/LC_MESSAGES', ['po/bg/gm-notify.mo']),