Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!1953

5 files changed, 26 insertions, 15 deletions

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index 56d2fb08ea..12069ac73b 100644
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -83,7 +83,7 @@ do_builder (GtkWidget *do_widget)
                                        window);
       gtk_widget_insert_action_group (window, "win", actions);
 
-      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/css_blendmodes.c b/demos/gtk-demo/css_blendmodes.c
index 3ddbbc0c37..df791aad31 100644
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -134,6 +134,8 @@ do_css_blendmodes (GtkWidget *do_widget)
                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
       setup_listbox (builder, provider);
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index 55af50c00c..913dc1c329 100644
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -85,7 +85,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
   if (!window)
     {
-      GtkWidget *paned, *container, *child;
+      GtkWidget *paned, *overlay, *child, *sw;
       GtkStyleProvider *provider;
       GtkTextBuffer *text;
       GBytes *bytes;
@@ -96,25 +96,25 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      container = gtk_overlay_new ();
-      gtk_window_set_child (GTK_WINDOW (window), container);
+      overlay = gtk_overlay_new ();
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
       gtk_widget_set_name (child, "canvas");
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
                                       drawing_area_draw,
                                       NULL, NULL);
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
       gtk_widget_set_name (child, "bricks-button");
       gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
       gtk_widget_set_size_request (child, 250, 84);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), paned);
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -132,10 +132,10 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_paned_set_end_child (GTK_PANED (paned), sw);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child);
       g_signal_connect (text,
                         "changed",
                         G_CALLBACK (css_text_changed),
diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c
index 78bd12f8b8..875179ddcb 100644
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -29,7 +29,7 @@ do_cursors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/revealer.c b/demos/gtk-demo/revealer.c
index 25f5fcd40b..0f7d097952 100644
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -25,13 +25,12 @@ static gboolean
 reveal_one (gpointer data)
 {
   GtkWidget *window = data;
-  GtkBuilder *builder;
   gchar *name;
   GtkRevealer *revealer;
 
-  builder = GTK_BUILDER (g_object_get_data (G_OBJECT (window), "builder"));
   name = g_strdup_printf ("revealer%d", count);
-  revealer = (GtkRevealer *)gtk_builder_get_object (builder, name);
+  revealer = GTK_REVEALER (g_object_get_data (G_OBJECT (window), name));
+  g_free (name);
 
   gtk_revealer_set_reveal_child (revealer, TRUE);
 
@@ -59,6 +58,7 @@ on_destroy (gpointer data)
       g_source_remove (timeout);
       timeout = 0;
     }
+
 }
 
 GtkWidget *
@@ -67,14 +67,23 @@ do_revealer (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
+      int i;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      for (i = 0; i < 10; i++)
+        {
+          char *name = g_strdup_printf ("revealer%d", i);
+          GtkWidget *revealer = GTK_WIDGET (gtk_builder_get_object (builder, name));
+          g_object_set_data (G_OBJECT (window), name, revealer);
+          g_free (name);
+        }
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))