aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/backend/ebook/e-book.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3267ea6656..c4c42d36e2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-11 Chris Toshok <toshok@ximian.com>
+
+ [ fixes bug #17332 ]
+ * backend/ebook/e-book.c (e_book_get_static_capabilities): we
+ shouldn't ever return NULL here. in error cases we need to return
+ g_strdup("");
+
2002-06-11 Christopher James Lahey <clahey@ximian.com>
* gui/widgets/e-minicard-view.c (e_minicard_view_event): Made
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index 28308a7016..ca9faff929 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -808,7 +808,7 @@ e_book_get_static_capabilities (EBook *book)
g_warning ("e_book_get_static_capabilities: Exception "
"during get_static_capabilities!\n");
CORBA_exception_free (&ev);
- return NULL;
+ return g_strdup("");
}
ret_val = g_strdup(temp);