[awn-extras-applets/f13/master] - apply upstream fix for mail applet (Bz 591211)

[leigh123linux]

commit 0b2b3b49f46ee55174b92d46a44cdd33a5971f86
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Tue Sep 14 21:07:06 2010 +0100

    - apply upstream fix for mail  applet (Bz 591211)

 1389_1388.diff          |   11 +++++++++++
 1390_1389.diff          |   13 +++++++++++++
 1391_1390.diff          |   22 ++++++++++++++++++++++
 awn-extras-applets.spec |   13 +++++++++++--
 4 files changed, 57 insertions(+), 2 deletions(-)
---
diff --git a/1389_1388.diff b/1389_1388.diff
new file mode 100644
index 0000000..00c5cdb
--- /dev/null
+++ b/1389_1388.diff
@@ -0,0 +1,11 @@
+=== modified file 'applets/maintained/mail/mail.desktop.in'
+--- applets/maintained/mail/mail.desktop.in	2009-11-12 18:02:11 +0000
++++ applets/maintained/mail/mail.desktop.in	2010-09-13 16:06:17 +0000
+@@ -6,5 +6,5 @@
+ _Comment=Check Your Email from AWN
+ Exec=awn-applet -p %k
+ X-AWN-AppletExec=mail/mail.py
+-Icon=mail/icons/read
++Icon=mail/icons/mail-read
+ X-AWN-AppletCategory=Network,Email
+
diff --git a/1390_1389.diff b/1390_1389.diff
new file mode 100644
index 0000000..2b0771c
--- /dev/null
+++ b/1390_1389.diff
@@ -0,0 +1,13 @@
+=== modified file 'applets/maintained/mail/mail.py'
+--- applets/maintained/mail/mail.py	2010-07-19 12:06:38 +0000
++++ applets/maintained/mail/mail.py	2010-09-13 16:17:51 +0000
+@@ -715,7 +715,7 @@
+                     raise RuntimeError(_("Could not log in: ") + str(message))
+ 
+                 else:
+-                    if not self.key.attrs.has_key("username"):
++                    if not key.attrs.has_key("username"):
+                         raise RuntimeError(_("Could not log in: No username"))
+                     self.server.user(key.attrs["username"])
+                     try:
+
diff --git a/1391_1390.diff b/1391_1390.diff
new file mode 100644
index 0000000..f4fb46b
--- /dev/null
+++ b/1391_1390.diff
@@ -0,0 +1,22 @@
+=== modified file 'applets/maintained/mail/mail.py'
+--- applets/maintained/mail/mail.py	2010-09-13 16:17:51 +0000
++++ applets/maintained/mail/mail.py	2010-09-13 16:49:15 +0000
+@@ -797,7 +797,7 @@
+                 if key.attrs["usessl"]:
+                     self.server = imaplib.IMAP4_SSL(*args)
+                 else:
+-                    self.server = imaplib.IMAP(*args)
++                    self.server = imaplib.IMAP4(*args)
+ 
+                 try:
+                     self.server.login(key.attrs["username"], key.password)
+@@ -825,7 +825,7 @@
+                         if s is not None:
+                             self.subjects.append(s[1][9:].replace("\r\n", "\n").replace("\n", "")) # Don't ask
+                 else:
+-                    mboxs = [re.search("(\W*) (\W*) (.*)", i).groups()[2][1:-1] for i in self.server.list()[1]]
++                    mboxs = [re.search("(\W*) (\W*) (.*)", i).groups()[2] for i in self.server.list()[1]]
+                     mboxs = [i for i in mboxs if i not in ("Sent", "Trash") and i[:6] != "[Gmail]"]
+ 
+                     emails = []
+
diff --git a/awn-extras-applets.spec b/awn-extras-applets.spec
index 6d7a577..49e1696 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -8,7 +8,7 @@
 
 Name:           awn-extras-applets
 Version:        0.4.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
@@ -29,6 +29,9 @@ Patch7:         1303_1302.diff
 Patch8:         1318_1317.diff
 Patch20:        1331_1330.diff
 Patch21:        1388_1387.diff
+Patch22:        1389_1388.diff
+Patch23:        1390_1389.diff
+Patch24:        1391_1390.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -109,6 +112,9 @@ awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 %patch8 -p0 -b .1318_1317
 %patch20 -p0 -b .1331_1330
 %patch21 -p0 -b .1388_1387
+%patch22 -p0 -b .1389_1388
+%patch23 -p0 -b .1390_1389
+%patch24 -p0 -b .1391_1390
 
 cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
 
@@ -218,8 +224,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 14 2010 leigh scott <leigh123linux at googlemail.com> - 0.4.0-21
+- apply upstream fix for mail  applet (Bz 591211)
+
 * Mon Sep 13 2010 leigh scott <leigh123linux at googlemail.com> - 0.4.0-20
-- apply upstream fix for dialect (Bz 607132)
+- apply upstream fix for dialect applet (Bz 607132)
 
 * Thu Aug 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-19
 - add requires alacarte (Bz 614700)