aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-10-24 11:04:01 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-10-24 11:04:01 +0800
commit8dd503d96703cf55cd7e2cce83c27f01b37e0462 (patch)
treef3e9c4fe22531ad23f1961ee0f3113a156065dc5 /addressbook/backend/ebook
parente4fa983be5e2c6a6496ba02f5391800ecee4575d (diff)
downloadgsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar.gz
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar.bz2
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar.lz
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar.xz
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.tar.zst
gsoc2013-evolution-8dd503d96703cf55cd7e2cce83c27f01b37e0462.zip
Fix command paths when we specify our pixmaps, so we don't get a lot of
2001-10-23 Jon Trowbridge <trow@ximian.com> * gui/component/addressbook.c: Fix command paths when we specify our pixmaps, so we don't get a lot of totally useless & very ugly bonobo-ui spew. * backend/ebook/e-book-util.c (e_book_nickname_query): The empty string as an arg shouldn't generate a warning. svn path=/trunk/; revision=13973
Diffstat (limited to 'addressbook/backend/ebook')
-rw-r--r--addressbook/backend/ebook/e-book-util.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index f9889522cb..2470d72950 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -503,7 +503,11 @@ e_book_nickname_query (EBook *book,
guint retval;
g_return_val_if_fail (E_IS_BOOK (book), 0);
- g_return_val_if_fail (nickname && *nickname, 0);
+ g_return_val_if_fail (nickname != NULL, 0);
+
+ /* The empty-string case shouldn't generate a warning. */
+ if (! *nickname)
+ return 0;
info = g_new0 (NicknameQueryInfo, 1);
info->nickname = g_strdup (nickname);