[Python-apps-commits] r6407 - in packages/kupfer/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, December 16, 2010 @ 21:43:02
  Author: dktrkranz
Revision: 6407

Do not crash if Evolution address book is missing

Added:
  packages/kupfer/trunk/debian/patches/evolution_contacts.patch
Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/patches/series

Modified: packages/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2010-12-16 20:50:00 UTC (rev 6406)
+++ packages/kupfer/trunk/debian/changelog	2010-12-16 21:43:02 UTC (rev 6407)
@@ -6,10 +6,12 @@
       on dual monitors (Closes: #588500, #588501).
   * debian/patches/debian_path.patch:
     - Refresh for new upstream release.
+  * debian/patches/evolution_contacts.patch:
+    - Do not crash if Evolution address book is missing (Closes: #606956).
   * debian/control:
     - Bump Standards-Version to 3.9.1, no changes required.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 16 Dec 2010 21:48:22 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 16 Dec 2010 22:41:59 +0100
 
 kupfer (0+v201-2) unstable; urgency=low
 

Added: packages/kupfer/trunk/debian/patches/evolution_contacts.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/evolution_contacts.patch	                        (rev 0)
+++ packages/kupfer/trunk/debian/patches/evolution_contacts.patch	2010-12-16 21:43:02 UTC (rev 6407)
@@ -0,0 +1,14 @@
+Index: kupfer-v203/kupfer/plugin/evolution.py
+===================================================================
+--- kupfer-v203.orig/kupfer/plugin/evolution.py	2010-12-16 22:19:15.176891584 +0100
++++ kupfer-v203/kupfer/plugin/evolution.py	2010-12-16 22:20:06.415639740 +0100
+@@ -100,7 +100,8 @@
+ 		super(ContactsSource, self).__init__(name, "Contacts")
+ 
+ 	def get_items(self):
+-		ebook_ = evolution.ebook.open_addressbook("default")
++		if not ebook_:
++			return
+ 		for contact in ebook_.get_all_contacts():
+ 			name = contact.get_property("full-name")
+ 			email = contact.get_property("email-1")

Modified: packages/kupfer/trunk/debian/patches/series
===================================================================
--- packages/kupfer/trunk/debian/patches/series	2010-12-16 20:50:00 UTC (rev 6406)
+++ packages/kupfer/trunk/debian/patches/series	2010-12-16 21:43:02 UTC (rev 6407)
@@ -1 +1,2 @@
 debian_path.patch
+evolution_contacts