aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/folder-browser-factory.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ca252f840b..73fdb90ed4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * folder-browser-factory.c (control_activate): Set the UI
+ component on the search bar.
+
2002-03-14 Dan Winship <danw@ximian.com>
* component-factory.c (folder_types): Remove "mailstorage", since
@@ -38,6 +43,7 @@
default size of the window, so we don't get this itty-bitty window
the size of a quarter on the screen when it first gets shown.
+>>>>>>> 1.2080
2002-03-12 Jeffrey Stedfast <fejj@ximian.com>
* mail-display.c (on_link_clicked): Handle digest: urls.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 52f39a8218..395dc26ae8 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -99,6 +99,8 @@ control_activate (BonoboControl *control,
if (fb->folder)
mail_refresh_folder (fb->folder, NULL, NULL);
+
+ e_search_bar_set_ui_component (E_SEARCH_BAR (fb->search), uic);
}
static void
@@ -118,6 +120,8 @@ control_deactivate (BonoboControl *control,
folder_browser_set_ui_component (fb, NULL);
folder_browser_set_shell_view (fb, CORBA_OBJECT_NIL);
+
+ e_search_bar_set_ui_component (E_SEARCH_BAR (fb->search), NULL);
}
static void