Merge branch 'leak-fixes' into 'master'

Leak fixes

See merge request GNOME/gtk!2406

4 files changed, 8 insertions, 9 deletions

diff --git a/demos/gtk-demo/listview_colors.c b/demos/gtk-demo/listview_colors.c
index b63f2366e0..c8cf07cdba 100644
--- a/demos/gtk-demo/listview_colors.c
+++ b/demos/gtk-demo/listview_colors.c
@@ -1118,6 +1118,8 @@ do_listview_colors (GtkWidget *do_widget)
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
 
       g_object_bind_property (dropdown, "selected-item", gridview, "factory", G_BINDING_SYNC_CREATE);
+
+      g_object_unref (selection);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 1589b3d4bc..b14e3b0909 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -319,13 +319,13 @@ fontify (const char    *format,
   bytes = fontify_text (format, text);
   if (bytes)
     {
-      const char *markup;
+      char *markup;
       gsize len;
 
-      markup = g_bytes_get_data (bytes, &len);
+      markup = g_bytes_unref_to_data (bytes, &len);
       gtk_text_buffer_delete (source_buffer, &start, &end);
       gtk_text_buffer_insert_markup (source_buffer, &start, markup, len);
-      g_bytes_unref (bytes);
+      g_free (markup);
     }
 
   g_free (text);
diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index a7802a3504..5721d02418 100644
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -189,12 +189,7 @@ gdk_toplevel_default_init (GdkToplevelInterface *iface)
    * system spontaneously changing the configuration.
    *
    * It is the responsibility of the GdkToplevel user to handle this signal;
-   * failing to do so will result in an arbitrary fixed size being used as a
-   * result. The signal may be emitted with the pointer to the @size being
-   * %NULL, in which case only the minimum and maximum size needs to be
-   * computed. This could happen for example if the toplevel configuration is in
-   * a state where the size is decided by the windowing system, such as
-   * maximized or fullscreen.
+   * failing to do so will result in an arbitrary size being used as a result.
    */
   signals[COMPUTE_SIZE] =
     g_signal_new ("compute-size",
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 0b03f97c62..33d9b4a8c4 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -4575,6 +4575,8 @@ gtk_text_buffer_insert_with_attributes (GtkTextBuffer *buffer,
       gtk_text_buffer_insert_with_tags (buffer, iter, text + start, end - start, tag, NULL);
 
       gtk_text_buffer_get_iter_at_mark (buffer, iter, mark);
+
+       g_object_unref (tag);
     }
   while (pango_attr_iterator_next (attr));