aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-search-bar.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index e90f9b7375..798c8a882e 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-30 Li Yuan <li.yuan@sun.com>
+
+ Fix for #343280.
+ * e-search-bar.c: (add_button):
+ No need to add label when we use gtk_button_new_from_stock
+ to create a button.
+
2006-05-26 Jeffrey Stedfast <fejj@novell.com>
Fix for Novell bug #178631
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 5dc7817583..275721dbe0 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -739,23 +739,17 @@ add_button (ESearchBar *esb,
const char *stock,
GCallback callback)
{
- GtkWidget *label;
GtkWidget *holder;
GtkWidget *button;
GtkWidget *image;
- label = gtk_label_new_with_mnemonic (text);
- gtk_misc_set_padding (GTK_MISC (label), 2, 0);
- gtk_widget_show (label);
-
/* See the comment in `put_in_spacer_widget()' to understand
why we have to do this. */
image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
- button = gtk_button_new_from_stock (text);
+ button = gtk_button_new_with_mnemonic (text);
gtk_button_set_image (button, image);
gtk_widget_show (button);
- gtk_container_add (GTK_CONTAINER (button), label);
holder = put_in_spacer_widget (button);
gtk_widget_show (holder);