Merge lp:~om26er/ubuntu/maverick/papyon/papyon-fix2-665526 into lp:ubuntu/maverick-proposed/papyon

[Omer Akram]

[Omer Akram (om26er)]

resubmitted the merge proposal since the first one had a lot of corrections and would have spoiled the maverick bzr history ;)

[Artur Rona (ari-tczew)]

Now looks good, package built fine. Please upload it.

review: Approve

Unmerged revisions

27. By Omer Akram on 2010-12-01

* debian/patches/dont_send_invalid_ADL.patch:
  - Don't send invalid ADL when a contact is on both Allow and Block list. (LP: #665526)

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-20 23:27:15 +0000
+++ debian/changelog	2010-12-01 10:33:53 +0000
@@ -1,3 +1,10 @@
+papyon (0.5.1-0ubuntu2.1) maverick-proposed; urgency=low
+
+  * debian/patches/dont_send_invalid_ADL.patch:
+    - Don't send invalid ADL when a contact is on both Allow and Block list. (LP: #665526)
+
+ -- Omer Akram <[e-mail]>  Wed, 01 Dec 2010 15:20:42 +0500
+
 papyon (0.5.1-0ubuntu2) maverick-proposed; urgency=low
 
   * debian/patches/lp_663670.patch

=== added file 'debian/patches/dont_send_invalid_ADL.patch'
--- debian/patches/dont_send_invalid_ADL.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont_send_invalid_ADL.patch	2010-12-01 10:33:53 +0000
@@ -0,0 +1,31 @@
+From: Omer Akram <[e-mail]>
+Author: Louis-Francis Ratté-Boulianne <[e-mail]>
+Subject: Don't send invalid ADL when a contact is on both Allow and Block list.
+Origin: http://cgit.freedesktop.org/papyon/commit/?id=991500a6d4c0c86e39738cf233a136c2a60e2951
+Bug-Ubuntu: https://launchpad.net/bugs/665526
+
+---
+diff --git a/papyon/msnp/notification.py b/papyon/msnp/notification.py
+index 83e7fce..0203c1a 100644
+--- a/papyon/msnp/notification.py
++++ b/papyon/msnp/notification.py
+@@ -768,9 +768,16 @@ class NotificationProtocol(BaseProtocol, gobject.GObject):
+                 address_book.profile.display_name)
+ 
+         contacts = address_book.contacts.group_by_domain()
++        mask = ~(profile.Membership.REVERSE | profile.Membership.PENDING)
++
++        for contact in address_book.contacts:
++            if (contact.memberships & mask & ~profile.Membership.FORWARD) == \
++                    (profile.Membership.ALLOW | profile.Membership.BLOCK):
++                logger.warning("Contact is on both Allow and Block list; " \
++                               "removing from Allow list (%s)" % contact.account)
++                contact._remove_membership(profile.Membership.ALLOW)
+ 
+         payloads = ['<ml l="1">']
+-        mask = ~(profile.Membership.REVERSE | profile.Membership.PENDING)
+         for domain, contacts in contacts.iteritems():
+             payloads[-1] += '<d n="%s">' % domain
+             for contact in contacts:
+--
+cgit v0.8.3-6-g21f6

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-20 23:27:15 +0000
+++ debian/patches/series	2010-12-01 10:33:53 +0000
@@ -1,1 +1,2 @@
+dont_send_invalid_ADL.patch
 lp_663670.patch