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

1 files changed, 16 insertions, 2 deletions

diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 3ca381f92e..10c4eef8db 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -47,6 +47,12 @@ extern "C" {
 typedef struct {
 	char *text;
 	int id;
+} ESearchBarSubitem;
+	
+typedef struct {
+	char *text;
+	int id;
+	ESearchBarSubitem *subitems;
 } ESearchBarItem;
 
 typedef struct _ESearchBar       ESearchBar;
@@ -60,14 +66,21 @@ struct _ESearchBar
 	GtkWidget *dropdown;
 	GtkWidget *option;
 	GtkWidget *entry;
+	GtkWidget *suboption; /* an option menu for the choices associated with some options */
+	
 
 	/* PRIVATE */
 	GtkWidget *dropdown_holder;	/* holds the dropdown */
 	GtkWidget *option_menu;
+	GtkWidget *suboption_menu;
 	GtkWidget *dropdown_menu;
 	GtkWidget *activate_button;
+	GtkWidget *entry_box;
+	GList     *subitem_garbage;
+	guint      pending_change;
 
 	int        option_choice;
+	int        suboption_choice; /* < 0 if the entry widget is active */
 };
 
 struct _ESearchBarClass
@@ -95,8 +108,9 @@ GtkWidget *e_search_bar_new        (ESearchBarItem *menu_items,
 
 void       e_search_bar_set_menu_sensitive(ESearchBar *search_bar, int id, gboolean state);
 
-int        e_search_bar_get_option_choice (ESearchBar *search_bar);
-char      *e_search_bar_get_text          (ESearchBar *search_bar);
+int        e_search_bar_get_option_choice    (ESearchBar *search_bar);
+int        e_search_bar_get_suboption_choice (ESearchBar *search_bar);
+char      *e_search_bar_get_text             (ESearchBar *search_bar);
 
 #ifdef __cplusplus
 }