summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-09-28 20:08:24 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-09-28 20:08:24 +0000
commite5a2f7918b103e5c63d2163cba004b06041f4b10 (patch)
treec3c2ed12f78874cc25059635a7e1c1a1e6da6455
parent75732772a8dbae7475a73c6bb9697d8876e0ca7f (diff)
downloadgdk-pixbuf-e5a2f7918b103e5c63d2163cba004b06041f4b10.tar.gz
Don't unref NULL. (#316828, Tor Lillqvist)
2005-09-28 Matthias Clasen <mclasen@redhat.com> * gtk/gtkclipboard.c (request_image_received_func): Don't unref NULL. (#316828, Tor Lillqvist)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkclipboard.c3
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d1826d84..34482b32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkclipboard.c (request_image_received_func): Don't unref
+ NULL. (#316828, Tor Lillqvist)
+
2005-09-28 Tor Lillqvist <tml@novell.com>
* modules/input/imime.c: Include <config.h>. (#317444, Kazuki
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d1826d84..34482b32a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-28 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkclipboard.c (request_image_received_func): Don't unref
+ NULL. (#316828, Tor Lillqvist)
+
2005-09-28 Tor Lillqvist <tml@novell.com>
* modules/input/imime.c: Include <config.h>. (#317444, Kazuki
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 2a9c79a03..25ceda27b 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1032,7 +1032,8 @@ request_image_received_func (GtkClipboard *clipboard,
info->callback (clipboard, result, info->user_data);
g_free (info);
- g_object_unref (result);
+ if (result)
+ g_object_unref (result);
}
/**