[Start implementing the new Search Bar design.]

* e-search-bar.c (init): Init various members to NULL.
(set_dropdown): Removed.
(add_dropdown): Removed.
(set_menu): New.
(add_menu_items): New.
(set_option): No need to setup the dropdown size here anymore.
(verb_cb): Function implementing the search menu verbs.
(update_bonobo_menus): New.
(e_search_bar_set_ui_component): New.

* e-search-bar.h: Remove the dropdown button stuff from struct
ESearchBar.  Add `uic' and `items' members.

* e-filter-bar.c (e_filter_bar_new): Get a @uic arg.

* folder-browser-factory.c (control_activate): Set the UI
component on the search bar.

* gui/tasks-control.c (tasks_control_activate): Call
`e_tasks_set_ui_component()' here to give it the
BonoboUIComponent.
(tasks_control_deactivate): Likewise, call it here to unset the
BonoboUIComponent.

* gui/e-tasks.c (e_tasks_set_ui_component): New.

* gui/calendar-commands.c (calendar_control_activate): Call
gnome_calendar_set_ui_component() here.
(calendar_control_deactivate): ...And here, with a NULL
BonoboUIComponent.

* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.

* gui/component/addressbook.c (control_activate): Call
`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
the search bar.

* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
for the LDAP sources configuration control.

svn path=/trunk/; revision=16178

1 files changed, 7 insertions, 6 deletions

diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 9ff4c55aa0..f32a2c0ad9 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -149,7 +149,7 @@ menubar_activated (ESearchBar *esb, int id, void *data)
 			GnomeDialog *gd;
 			
 			gd = (GnomeDialog *) rule_editor_new (efb->context, FILTER_SOURCE_INCOMING);
-			efb->save_dialogue = gd;
+			efb->save_dialogue = (GtkWidget *) gd;
 			gtk_window_set_title (GTK_WINDOW (gd), _("Search Editor"));
 			gtk_signal_connect (GTK_OBJECT (gd), "clicked", full_rule_editor_clicked, efb);
 			gtk_signal_connect (GTK_OBJECT (gd), "destroy", rule_editor_destroyed, efb);
@@ -460,8 +460,6 @@ context_changed (RuleContext *context, gpointer user_data)
 static void
 context_rule_removed (RuleContext *context, FilterRule *rule, gpointer user_data)
 {
-	EFilterBar *efb = E_FILTER_BAR (user_data);
-
 	/*gtk_signal_disconnect_by_func((GtkObject *)rule, rule_changed, efb);*/
 }
 
@@ -597,14 +595,17 @@ init (EFilterBar *efb)
 /* Object construction.  */
 
 EFilterBar *
-e_filter_bar_new (RuleContext *context, const char *systemrules, const char *userrules,
-		  EFilterBarConfigRule config, void *data)
+e_filter_bar_new (RuleContext *context,
+		  const char *systemrules,
+		  const char *userrules,
+		  EFilterBarConfigRule config,
+		  void *data)
 {
 	EFilterBar *bar;
 	ESearchBarItem item = { NULL, -1, NULL };
 	
 	bar = gtk_type_new (e_filter_bar_get_type ());
-	
+
 	bar->context = context;
 	gtk_object_ref (GTK_OBJECT (context));