Correctly initialize targets. (#139883, John Finlay)

2004-04-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
	initialize targets.  (#139883, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 34ee22ae57d2816579bba833d3ebef628c56326c..0e9ccbfa7ec45c39a7d2e3b1158f0dad389e43d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
+       initialize targets.  (#139883, John Finlay)
+
        * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. 
 
        * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 34ee22ae57d2816579bba833d3ebef628c56326c..0e9ccbfa7ec45c39a7d2e3b1158f0dad389e43d0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
+       initialize targets.  (#139883, John Finlay)
+
        * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. 
 
        * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 34ee22ae57d2816579bba833d3ebef628c56326c..0e9ccbfa7ec45c39a7d2e3b1158f0dad389e43d0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
+       initialize targets.  (#139883, John Finlay)
+
        * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. 
 
        * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 34ee22ae57d2816579bba833d3ebef628c56326c..0e9ccbfa7ec45c39a7d2e3b1158f0dad389e43d0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
+       initialize targets.  (#139883, John Finlay)
+
        * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. 
 
        * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 34ee22ae57d2816579bba833d3ebef628c56326c..0e9ccbfa7ec45c39a7d2e3b1158f0dad389e43d0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-04-23  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
+       initialize targets.  (#139883, John Finlay)
+
        * gdk/gdkdraw.c (gdk_draw_drawable): Small doc improvement. 
 
        * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): 

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index ba48ba26b43868488b60c2b8e7a0db85947f676c..107b40d6978d6ceccec22122e8f86fa8a02c2bcb 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1095,7 +1095,8 @@ gtk_clipboard_wait_for_targets (GtkClipboard  *clipboard,
   if (n_targets)
     *n_targets = 0;
       
-  targets = NULL;      
+  if (targets)
+    *targets = NULL;      
 
   data = gtk_clipboard_wait_for_contents (clipboard, gdk_atom_intern ("TARGETS", FALSE));