aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-08-11 06:36:41 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-08-11 06:36:41 +0800
commit78544223ad29c9e74282134663370c3c71360f1b (patch)
treeaad15f9a6c407fe000ebda865c012b4b9e440d55 /addressbook
parent8e3b907c2e99770452549aa310a65cce4573cb67 (diff)
downloadgsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar.gz
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar.bz2
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar.lz
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar.xz
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.tar.zst
gsoc2013-evolution-78544223ad29c9e74282134663370c3c71360f1b.zip
Removed comment about the need to resolve nicknames properly, because we
2001-08-10 Jon Trowbridge <trow@ximian.com> * e-msg-composer-hdrs.c (set_recipients): Removed comment about the need to resolve nicknames properly, because we now do that. 2001-08-10 Jon Trowbridge <trow@ximian.com> * e-filter-bar.h: Set the subitems to NULL in the pre-defined ESearchBarItems. * e-filter-bar.c (rule_editor_clicked): Set the ESearchBarItem's subitems to NULL. (build_items): Set the ESearchBarItem's subitems to NULL. (e_filter_bar_new): Set the ESearchBarItem's subitems to NULL. * e-search-bar.c: Added support for subitems, so that a search option can key off of another option menu rather than just an entry. 2001-08-10 Jon Trowbridge <trow@ximian.com> * gui/component/addressbook.c: Set the ESearchBarItem subitems explicitly to NULL. 2001-08-10 Jon Trowbridge <trow@ximian.com> * gui/cal-search-bar.c: Where we have ESearchBarItems, set their subitems to NULL. 2001-08-10 Jon Trowbridge <trow@ximian.com> * folder-browser.c: Set our ESearchBarItems subitems to NULL. svn path=/trunk/; revision=11904
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook.c14
2 files changed, 12 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 58fe5ea77e..7f1ba40654 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-10 Jon Trowbridge <trow@ximian.com>
+
+ * gui/component/addressbook.c: Set the ESearchBarItem
+ subitems explicitly to NULL.
+
2001-08-10 Anna Marie Dirks <anna@ximian.com>
* gui/component/select-names/select-names.glade: did a little
packing-magic to get the two tables at bottom of this dialog
@@ -6,7 +11,6 @@
*gui/component/select-names/e-select-names.c: changed the title
of this dialog to "Select Contacts from Addressbook".
-
2001-08-09 Anna Marie Dirks <anna@ximian.com>
* gui/component/select-names/select-names.glade: redesigned
this dialog to fix bug #6815.
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index b629bdcf2e..c04a3218a1 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -612,7 +612,7 @@ set_prop (BonoboPropertyBag *bag,
static ESearchBarItem addressbook_search_menu_items[] = {
E_FILTERBAR_RESET,
- { NULL, -1 },
+ { NULL, -1, NULL },
};
static void
@@ -634,12 +634,12 @@ enum {
};
static ESearchBarItem addressbook_search_option_items[] = {
- { N_("Any field contains"), ESB_ANY },
- { N_("Name contains"), ESB_FULL_NAME },
- { N_("Email contains"), ESB_EMAIL },
- { N_("Category contains"), ESB_CATEGORY },
- { N_("Advanced..."), ESB_ADVANCED },
- { NULL, -1 }
+ { N_("Any field contains"), ESB_ANY, NULL },
+ { N_("Name contains"), ESB_FULL_NAME, NULL },
+ { N_("Email contains"), ESB_EMAIL, NULL },
+ { N_("Category contains"), ESB_CATEGORY, NULL },
+ { N_("Advanced..."), ESB_ADVANCED, NULL },
+ { NULL, -1, NULL }
};
static void