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)
This commit is contained in:
Matthias Clasen 2004-10-27 19:01:25 +00:00 committed by Matthias Clasen
parent 599851c837
commit c1885969c0
5 changed files with 16 additions and 3 deletions

View File

@ -1,5 +1,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)

View File

@ -1,5 +1,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)

View File

@ -1,5 +1,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)

View File

@ -1,5 +1,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)

View File

@ -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,