diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-util.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 8 |
3 files changed, 16 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ff4352e232..147da44166 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,12 @@ 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. + * gui/component/select-names/e-select-names-completion.c: Removed our cancelled flag and e_select_names_completion_cancel function, since we were just duplicating stuff that had ended up in 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); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index c9f2693997..804154fb88 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -332,10 +332,10 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"), E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"), - E_PIXMAP ("/menu/Edit/ContactsCut", "16_cut.png"), - E_PIXMAP ("/menu/Edit/ContactsCopy", "16_copy.png"), - E_PIXMAP ("/menu/Edit/ContactsPaste", "16_paste.png"), - E_PIXMAP ("/menu/Edit/ContactDelete", "evolution-trash-mini.png"), + E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "16_cut.png"), + E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "16_copy.png"), + E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "16_paste.png"), + E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "evolution-trash-mini.png"), E_PIXMAP ("/menu/Tools/ComponentPlaceholder/ToolSearch", "search-16.png"), E_PIXMAP ("/menu/Tools/ComponentPlaceholder/AddressbookConfig", "configure_16_addressbook.xpm"), |