aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-05-20 04:26:34 +0800
committerChris Toshok <toshok@src.gnome.org>2003-05-20 04:26:34 +0800
commit6052618948ddc67076b41c4fe9b14f44ad9a727b (patch)
tree8b0849f7a705900c2c2c0986900a96834a90733c /addressbook
parentf68ef51327afc9c49b9cf0c71666fca8c3a806a9 (diff)
downloadgsoc2013-evolution-6052618948ddc67076b41c4fe9b14f44ad9a727b.tar.gz
gsoc2013-evolution-6052618948ddc67076b41c4fe9b14f44ad9a727b.tar.zst
gsoc2013-evolution-6052618948ddc67076b41c4fe9b14f44ad9a727b.zip
handle the case where @book == NULL, which can happen if there was a
2003-05-19 Chris Toshok <toshok@ximian.com> * backend/ebook/e-destination.c (use_default_book_cb): handle the case where @book == NULL, which can happen if there was a problem opening the default book. Should fix #43005. svn path=/trunk/; revision=21269
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/backend/ebook/e-destination.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e7589fad72..71cb31aa2a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2003-05-19 Chris Toshok <toshok@ximian.com>
+ * backend/ebook/e-destination.c (use_default_book_cb): handle the
+ case where @book == NULL, which can happen if there was a problem
+ opening the default book. Should fix #43005.
+
+2003-05-19 Chris Toshok <toshok@ximian.com>
+
* gui/component/addressbook-component.c
(ensure_completion_uris_exist): fix the initial run case. the
config upgrade code creates all elements so we can't just check
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 7ea2f5690f..7ddae75b48 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -1039,12 +1039,15 @@ static void
use_default_book_cb (EBook *book, gpointer closure)
{
EDestination *dest = E_DESTINATION (closure);
- if (dest->priv->cardify_book == NULL) {
+ if (book != NULL && dest->priv->cardify_book == NULL) {
dest->priv->cardify_book = book;
g_object_ref (book);
}
- launch_cardify_query (dest);
+ if (dest->priv->cardify_book)
+ launch_cardify_query (dest);
+ else
+ g_object_unref (dest);
}