diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 396a087d19..776adc0930 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -41,7 +41,6 @@ #include "gtkenums.h" #include "gtkbindings.h" #include "gtkdialog.h" -#include "gtkrevealer.h" #include "gtkintl.h" #include "gtkprivate.h" #include "gtkorientable.h" @@ -128,7 +127,6 @@ struct _GtkInfoBarPrivate GtkWidget *content_area; GtkWidget *action_area; GtkWidget *close_button; - GtkWidget *revealer; gboolean show_close_button; GtkMessageType message_type; @@ -379,36 +377,6 @@ gtk_info_bar_draw (GtkWidget *widget, return FALSE; } -static void -gtk_info_bar_show (GtkWidget *widget) -{ - GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv; - - GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->show (widget); - - gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), TRUE); -} - -static void -child_revealed (GObject *object, GParamSpec *pspec, gpointer data) -{ - GtkWidget *widget = data; - - GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->hide (widget); - g_signal_handlers_disconnect_by_func (object, child_revealed, widget); - g_object_notify (G_OBJECT (widget), "visible"); -} - -static void -gtk_info_bar_hide (GtkWidget *widget) -{ - GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv; - - gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), FALSE); - g_signal_connect_object (priv->revealer, "notify::child-revealed", - G_CALLBACK (child_revealed), widget, 0); -} - static void gtk_info_bar_class_init (GtkInfoBarClass *klass) { @@ -426,8 +394,6 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) widget_class->get_preferred_width = gtk_info_bar_get_preferred_width; widget_class->get_preferred_height = gtk_info_bar_get_preferred_height; widget_class->draw = gtk_info_bar_draw; - widget_class->show = gtk_info_bar_show; - widget_class->hide = gtk_info_bar_hide; klass->close = gtk_info_bar_close; @@ -583,7 +549,6 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, content_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, action_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, close_button); - gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, revealer); } static void diff --git a/gtk/gtkinfobar.ui b/gtk/gtkinfobar.ui index b5823fa9b4..35e210762f 100644 --- a/gtk/gtkinfobar.ui +++ b/gtk/gtkinfobar.ui @@ -5,76 +5,62 @@ True False - + True False + 8 + 16 - + + + + + True + True + 0 + + + + + True + False + 6 + horizontal + 6 + end + + + + + + False + True + 1 + + + + + False + True + 6 + none + + + True False - 0 - 0 - - - True - False - 8 - 16 - - - - - - True - True - 0 - - - - - True - False - 6 - horizontal - 6 - end - - - - - - False - True - 1 - - - - - False - True - 6 - none - - - - True - False - window-close-symbolic - - - - - False - True - 2 - - + window-close-symbolic + + False + True + 2 +