aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/e-search-bar.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 19488aafa3..57b293741c 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-08 Dan Winship <danw@ximian.com>
+
+ * e-search-bar.c (e_search_bar_construct): Construct the buttons
+ earlier so that the option-menu-setup code that tries to adjust
+ the button sensitivity won't fail and g_warn.
+
2002-04-06 JP Rosevear <jpr@ximian.com>
* e-multi-config-dialog.c (e_multi_config_dialog_show_page): show
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index f0b667d6b1..85a72d8ba6 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -832,6 +832,11 @@ e_search_bar_construct (ESearchBar *search_bar,
gtk_box_set_spacing (GTK_BOX (search_bar), 1);
+ search_bar->activate_button = add_button (search_bar, _("Find Now"),
+ GTK_SIGNAL_FUNC (activate_button_clicked_cb));
+ search_bar->clear_button = add_button (search_bar, _("Clear"),
+ GTK_SIGNAL_FUNC (clear_button_clicked_cb));
+
e_search_bar_set_menu (search_bar, menu_items);
search_bar->entry_box = gtk_hbox_new (0, FALSE);
@@ -841,11 +846,6 @@ e_search_bar_construct (ESearchBar *search_bar,
gtk_widget_show (search_bar->entry_box);
gtk_box_pack_start (GTK_BOX(search_bar), search_bar->entry_box, TRUE, TRUE, 0);
- search_bar->activate_button = add_button (search_bar, _("Find Now"),
- GTK_SIGNAL_FUNC (activate_button_clicked_cb));
- search_bar->clear_button = add_button (search_bar, _("Clear"),
- GTK_SIGNAL_FUNC (clear_button_clicked_cb));
-
/*
* If the default choice for the option menu has subitems, then we need to
* activate the search immediately. However, the developer won't have