summaryrefslogtreecommitdiff
path: root/gtk/gtkclipboard.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-12-28 04:31:40 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-12-28 04:31:40 +0000
commit676322ac06bd2dd67906e4839c6ef316a9f42151 (patch)
treeeeff12710d75d60a2b74d8913b6de4a313047e97 /gtk/gtkclipboard.c
parent34982b41d200b79faca6f97317fa43853cc435d5 (diff)
downloadgtk+-676322ac06bd2dd67906e4839c6ef316a9f42151.tar.gz
Make the clipboard image API more robust (#162357, Torsten Schoenfeld):
2004-12-27 Matthias Clasen <mclasen@redhat.com> Make the clipboard image API more robust (#162357, Torsten Schoenfeld): * gtk/gtkclipboard.c (clipboard_image_received_func): Don't ref the pixbuf if it is NULL. * gtk/gtkselection.c (gtk_selection_data_set_pixbuf): NULL-terminate the varargs in the call to gdk_pixbuf_save_to_buffer(). (gtk_selection_data_get_pixbuf): Only use a pixbuf loader if there is data to load.
Diffstat (limited to 'gtk/gtkclipboard.c')
-rw-r--r--gtk/gtkclipboard.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 150e801a25..bf88e8de7a 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1245,7 +1245,9 @@ clipboard_image_received_func (GtkClipboard *clipboard,
{
WaitResults *results = data;
- results->data = g_object_ref (pixbuf);
+ if (pixbuf)
+ results->data = g_object_ref (pixbuf);
+
g_main_loop_quit (results->loop);
}