From c1885969c0439b10ba71f45b1007e80e9c7bf566 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Oct 2004 19:01:25 +0000 Subject: [PATCH] Silently ignore non-CLIPBOARD clipboards. (#156610, Christian Persch) 2004-10-27 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently ignore non-CLIPBOARD clipboards. (#156610, Christian Persch) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkclipboard.c | 7 ++++--- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3e8b71415..771036d320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-27 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c3e8b71415..771036d320 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-27 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c3e8b71415..771036d320 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-27 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c3e8b71415..771036d320 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-27 Matthias Clasen + * 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) diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index abb6ad2648..10f4793b1f 100644 --- a/gtk/gtkclipboard.c +++ b/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,