callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix command paths when we specify our pixmaps, so we don't get a lot of

Browse Source 
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
This commit is contained in:
Jon Trowbridge
2001-10-24 03:04:01 +00:00
committed by Jon Trowbridge
parent e4fa983be5
commit 8dd503d967
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/ChangeLog
View File

@ -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

6
addressbook/backend/ebook/e-book-util.c
View File

@ -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);

8
addressbook/gui/component/addressbook.c
View File

@ -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"),