rpms/gbirthday/devel gbirthday-ebook.patch, NONE, 1.1 gbirthday.spec, 1.9, 1.10

[tomspur]

Author: tomspur

Update of /cvs/pkgs/rpms/gbirthday/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1261

Modified Files:
	gbirthday.spec 
Added Files:
	gbirthday-ebook.patch 
Log Message:
add patch for checking for nonetype, bug #548007

gbirthday-ebook.patch:
 Changelog                  |    3 +++
 src/gbirthday/databases.py |    2 ++
 2 files changed, 5 insertions(+)

--- NEW FILE gbirthday-ebook.patch ---
commit 644ac8f5e838fe29ac6c0cf56f1bc53f5f7da12e
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Wed Dec 16 13:43:02 2009 +0100

    Without evolution addressbook, continue, without crashing
    
    Signed-off-by: Thomas Spura <tomspur at fedoraproject.org>

diff --git a/Changelog b/Changelog
index 42f8b07..8c587dc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+0.5.6
+	Without evolution addressbook, don't crash (fedora bug #548007)
+
 0.5.5
 	On double click, don't blink anymore.
 	Don't show 'don't blink', when not blinking atm
diff --git a/src/gbirthday/databases.py b/src/gbirthday/databases.py
index 8f62869..0a42ac4 100644
--- a/src/gbirthday/databases.py
+++ b/src/gbirthday/databases.py
@@ -236,6 +236,8 @@ class Evolution(DataBase):
 
         for title, book in evolution.ebook.list_addressbooks():
             ebook = evolution.ebook.open_addressbook(book)
+            if not ebook:
+                continue
             for contact in ebook.get_all_contacts():
                 # contact.props.birth_date{.year, .month, .day} non-existing
                 # -> using vcard


Index: gbirthday.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbirthday/devel/gbirthday.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gbirthday.spec	15 Dec 2009 23:56:41 -0000	1.9
+++ gbirthday.spec	17 Dec 2009 01:32:44 -0000	1.10
@@ -2,12 +2,13 @@
 
 Name:           gbirthday
 Version:        0.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Birthday reminder for Evolution and some others
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://gbirthday.sourceforge.net
 Source:         http://downloads.sourceforge.net/gbirthday/gbirthday-%{version}.tar.xz
+Patch0:         %{name}-ebook.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,6 +32,7 @@ your contacs' birthday on next days.
 
 %prep
 %setup -q -c %{name}-%{version}
+%patch0 -p1
 
 %build
 
@@ -60,6 +62,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Tue Dec 17 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-3
+- add ebook.patch, applied from upstream git repo, fixes bug #548007
+
 * Wed Dec 16 2009 Thomas Spura <tomspur at fedoraproject.org> 0.5.5-2
 - upstream tarball was corected, still same version