From 8dd503d96703cf55cd7e2cce83c27f01b37e0462 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Wed, 24 Oct 2001 03:04:01 +0000 Subject: Fix command paths when we specify our pixmaps, so we don't get a lot of 2001-10-23 Jon Trowbridge * 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 --- addressbook/backend/ebook/e-book-util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'addressbook/backend/ebook/e-book-util.c') 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); -- cgit v1.2.3