diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 2 | ||||
| -rw-r--r-- | src/ephy-fullscreen-popup.c | 19 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 2 |
4 files changed, 15 insertions, 16 deletions
@@ -1,3 +1,11 @@ +2005-06-16 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/ContentHandler.cpp: + * src/ephy-fullscreen-popup.c: (ephy_fullscreen_popup_constructor): + * src/ephy-history-window.c: (confirmation_dialog_construct): + + Don't show the image after gtk_button_set_image(). Fixes bug #307818. + 2005-06-14 Crispin Flowerday <gnome@flowerday.cx> * embed/ephy-embed.c (ephy_embed_load_url): diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 91ca2b88d..39b032278 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -323,7 +323,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction () button = gtk_button_new_with_label (_("_Save As...")); image = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); - gtk_widget_show (image); + /* don't show the image! see bug #307818 */ gtk_widget_show (button); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, CONTENT_ACTION_SAVEAS); diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c index 28f48dd3e..f0f8187c4 100644 --- a/src/ephy-fullscreen-popup.c +++ b/src/ephy-fullscreen-popup.c @@ -228,7 +228,7 @@ ephy_fullscreen_popup_constructor (GType type, EphyFullscreenPopup *popup; EphyFullscreenPopupPrivate *priv; GtkWindow *window; - GtkWidget *hbox, *frame_hbox, *button_hbox, *icon, *label; + GtkWidget *hbox, *frame_hbox, *icon; object = parent_class->constructor (type, n_construct_properties, construct_params); @@ -275,24 +275,15 @@ ephy_fullscreen_popup_constructor (GType type, gtk_widget_show (priv->lock_ebox); /* exit button */ - priv->button = gtk_button_new (); + priv->button = gtk_button_new_with_label (_("Leave Fullscreen")); + icon = gtk_image_new_from_stock (STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (priv->button), icon); + /* don't show the image! see bug #307818 */ g_signal_connect (priv->button, "clicked", G_CALLBACK (exit_button_clicked_cb), popup); gtk_box_pack_start (GTK_BOX (hbox), priv->button, FALSE, FALSE, 0); gtk_widget_show (priv->button); - button_hbox = gtk_hbox_new (FALSE, 2); - gtk_container_add (GTK_CONTAINER (priv->button), button_hbox); - gtk_widget_show (button_hbox); - - icon = gtk_image_new_from_stock (STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON); - gtk_box_pack_start (GTK_BOX (button_hbox), icon, FALSE, FALSE, 0); - gtk_widget_show (icon); - - label = gtk_label_new (_("Leave Fullscreen")); - gtk_box_pack_start (GTK_BOX (button_hbox), label, FALSE, FALSE, 0); - gtk_widget_show (label); - ephy_fullscreen_popup_update_visibility (popup); return object; diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 0fe345ad1..ebcc7eacc 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -261,7 +261,7 @@ confirmation_dialog_construct (EphyHistoryWindow *editor) button = gtk_button_new_with_label (_("Cl_ear")); image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); - gtk_widget_show (image); + /* don't show the image! see bug #307818 */ gtk_widget_show (button); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_ACCEPT); |