1 From 4f27e87d62b480a49dcffc232e246295c32113ca Mon Sep 17 00:00:00 2001
2 From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
3 Date: Wed, 16 Nov 2011 09:03:12 +0100
4 Subject: [PATCH 02/68] Maintain map/unmap invariants in
7 We used to explicitly map and unmap the child GtkRecentChooserWidget when
8 mapping and unmapping the dialog, respectively. Now that GtkContainer actually
9 unmaps child widgets (instead of avoiding that), we can assume that the
10 child GtkRecentChooserWidget will be unmapped when we want it to be.
12 This fixes a warning from gtk_widget_verify_invariants(), as we were mapping
13 our child widget before calling our parent class' ::map() handler. Bug #659257.
14 (cherry picked from commit e8bb2e4545365d83261381a14920b773aba4a678)
16 gtk/gtkrecentchooserdialog.c | 30 ------------------------------
17 1 file changed, 30 deletions(-)
19 diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
20 index 058439a..1c67b7a 100644
21 --- a/gtk/gtkrecentchooserdialog.c
22 +++ b/gtk/gtkrecentchooserdialog.c
23 @@ -55,9 +55,6 @@ static void gtk_recent_chooser_dialog_get_property (GObject *object,
27 -static void gtk_recent_chooser_dialog_map (GtkWidget *widget);
28 -static void gtk_recent_chooser_dialog_unmap (GtkWidget *widget);
30 G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDialog,
31 gtk_recent_chooser_dialog,
33 @@ -68,16 +65,12 @@ static void
34 gtk_recent_chooser_dialog_class_init (GtkRecentChooserDialogClass *klass)
36 GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
37 - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
39 gobject_class->set_property = gtk_recent_chooser_dialog_set_property;
40 gobject_class->get_property = gtk_recent_chooser_dialog_get_property;
41 gobject_class->constructor = gtk_recent_chooser_dialog_constructor;
42 gobject_class->finalize = gtk_recent_chooser_dialog_finalize;
44 - widget_class->map = gtk_recent_chooser_dialog_map;
45 - widget_class->unmap = gtk_recent_chooser_dialog_unmap;
47 _gtk_recent_chooser_install_properties (gobject_class);
49 g_type_class_add_private (klass, sizeof (GtkRecentChooserDialogPrivate));
50 @@ -224,29 +217,6 @@ gtk_recent_chooser_dialog_finalize (GObject *object)
51 G_OBJECT_CLASS (gtk_recent_chooser_dialog_parent_class)->finalize (object);
55 -gtk_recent_chooser_dialog_map (GtkWidget *widget)
57 - GtkRecentChooserDialog *dialog = GTK_RECENT_CHOOSER_DIALOG (widget);
58 - GtkRecentChooserDialogPrivate *priv = dialog->priv;
60 - if (!gtk_widget_get_mapped (priv->chooser))
61 - gtk_widget_map (priv->chooser);
63 - GTK_WIDGET_CLASS (gtk_recent_chooser_dialog_parent_class)->map (widget);
67 -gtk_recent_chooser_dialog_unmap (GtkWidget *widget)
69 - GtkRecentChooserDialog *dialog = GTK_RECENT_CHOOSER_DIALOG (widget);
70 - GtkRecentChooserDialogPrivate *priv = dialog->priv;
72 - GTK_WIDGET_CLASS (gtk_recent_chooser_dialog_parent_class)->unmap (widget);
74 - gtk_widget_unmap (priv->chooser);
78 gtk_recent_chooser_dialog_new_valist (const gchar *title,
81 1.7.10.2 (Apple Git-33)