Silently ignore non-CLIPBOARD clipboards. (#156610, Christian Persch)

2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)

ChangeLog

 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
 	* gtk/gtksettings.c: Make it build on windows. (#156618,
 	Kazuki IWAMOTO)
 

ChangeLog.pre-2-10

 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
 	* gtk/gtksettings.c: Make it build on windows. (#156618,
 	Kazuki IWAMOTO)
 

ChangeLog.pre-2-6

 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
 	* gtk/gtksettings.c: Make it build on windows. (#156618,
 	Kazuki IWAMOTO)
 

ChangeLog.pre-2-8

 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
 	* gtk/gtksettings.c: Make it build on windows. (#156618,
 	Kazuki IWAMOTO)
 

gtk/gtkclipboard.c

@@ -1351,7 +1351,9 @@ gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
   };
   
   g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
-  g_return_if_fail (clipboard->selection == GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard->selection != GDK_SELECTION_CLIPBOARD)
+    return;
   
   g_free (clipboard->storable_targets);
   
@@ -1361,8 +1363,7 @@ gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
    * gtk_clipboard_set_can_store hasn't been called since the
    * clipboard owner changed. We only want to add SAVE_TARGETS and 
    * ref the owner once , so we do that here
-   */
-  
+   */  
   if (clipboard->n_storable_targets == -1)
     {
       gtk_selection_add_targets (clipboard_widget, clipboard->selection,