mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-24 12:41:16 +00:00
Remove unused variables. (gtk_clipboard_set_contents),
2008-02-13 Richard Hult <richard@imendio.com> * gtk/gtkclipboard-quartz.c: (gtk_clipboard_wait_for_contents): Remove unused variables. (gtk_clipboard_set_contents), (gtk_clipboard_get_owner), (clipboard_unset), (gtk_clipboard_request_targets): Notify the previous clipboard owner when the owner changes. Fixes bug #493406. svn path=/trunk/; revision=19560
This commit is contained in:
parent
24d682c1db
commit
fce8ef214e
@ -1,3 +1,12 @@
|
|||||||
|
2008-02-13 Richard Hult <richard@imendio.com>
|
||||||
|
|
||||||
|
* gtk/gtkclipboard-quartz.c: (gtk_clipboard_wait_for_contents):
|
||||||
|
Remove unused variables.
|
||||||
|
(gtk_clipboard_set_contents),
|
||||||
|
(gtk_clipboard_get_owner), (clipboard_unset),
|
||||||
|
(gtk_clipboard_request_targets): Notify the previous clipboard
|
||||||
|
owner when the owner changes. Fixes bug #493406.
|
||||||
|
|
||||||
2008-02-13 Richard Hult <richard@imendio.com>
|
2008-02-13 Richard Hult <richard@imendio.com>
|
||||||
|
|
||||||
* gdk/quartz/gdkcolor-quartz.c: (gdk_colormap_alloc_colors): Fix
|
* gdk/quartz/gdkcolor-quartz.c: (gdk_colormap_alloc_colors): Fix
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* GTK - The GIMP Toolkit
|
/* GTK - The GIMP Toolkit
|
||||||
* Copyright (C) 2000 Red Hat, Inc.
|
* Copyright (C) 2000 Red Hat, Inc.
|
||||||
* Copyright (C) 2004 Nokia Corporation
|
* Copyright (C) 2004 Nokia Corporation
|
||||||
* Copyright (C) 2006 Imendio AB
|
* Copyright (C) 2006-2008 Imendio AB
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
@ -94,26 +94,27 @@ struct _GtkClipboardClass
|
|||||||
GtkSelectionData selection_data;
|
GtkSelectionData selection_data;
|
||||||
guint info;
|
guint info;
|
||||||
|
|
||||||
selection_data.selection = clipboard->selection;
|
if (!clipboard->target_list)
|
||||||
selection_data.data = NULL;
|
return;
|
||||||
selection_data.target = _gtk_quartz_pasteboard_type_to_atom (type);
|
|
||||||
|
|
||||||
if (clipboard->target_list &&
|
memset (&selection_data, 0, sizeof (GtkSelectionData));
|
||||||
gtk_target_list_find (clipboard->target_list, selection_data.target, &info))
|
|
||||||
|
selection_data.selection = clipboard->selection;
|
||||||
|
selection_data.target = _gtk_quartz_pasteboard_type_to_atom (type);
|
||||||
|
selection_data.display = gdk_display_get_default ();
|
||||||
|
selection_data.length = -1;
|
||||||
|
|
||||||
|
if (gtk_target_list_find (clipboard->target_list, selection_data.target, &info))
|
||||||
{
|
{
|
||||||
clipboard->get_func (clipboard, &selection_data,
|
clipboard->get_func (clipboard, &selection_data,
|
||||||
info,
|
info,
|
||||||
clipboard->user_data);
|
clipboard->user_data);
|
||||||
}
|
|
||||||
else
|
_gtk_quartz_set_selection_data_for_pasteboard (clipboard->pasteboard,
|
||||||
{
|
&selection_data);
|
||||||
selection_data.length = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
_gtk_quartz_set_selection_data_for_pasteboard (clipboard->pasteboard,
|
g_free (selection_data.data);
|
||||||
&selection_data);
|
}
|
||||||
|
|
||||||
g_free (selection_data.data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)pasteboardChangedOwner:(NSPasteboard *)sender
|
- (void)pasteboardChangedOwner:(NSPasteboard *)sender
|
||||||
@ -393,6 +394,27 @@ gtk_clipboard_set_contents (GtkClipboard *clipboard,
|
|||||||
|
|
||||||
types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
|
types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
|
||||||
|
|
||||||
|
if (!(clipboard->have_owner && have_owner) ||
|
||||||
|
clipboard->user_data != user_data)
|
||||||
|
{
|
||||||
|
clipboard_unset (clipboard);
|
||||||
|
|
||||||
|
if (clipboard->get_func)
|
||||||
|
{
|
||||||
|
/* Calling unset() caused the clipboard contents to be reset!
|
||||||
|
* Avoid leaking and return
|
||||||
|
*/
|
||||||
|
if (!(clipboard->have_owner && have_owner) ||
|
||||||
|
clipboard->user_data != user_data)
|
||||||
|
{
|
||||||
|
(*clear_func) (clipboard, user_data);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
clipboard->user_data = user_data;
|
clipboard->user_data = user_data;
|
||||||
clipboard->have_owner = have_owner;
|
clipboard->have_owner = have_owner;
|
||||||
if (have_owner)
|
if (have_owner)
|
||||||
@ -526,6 +548,7 @@ clipboard_unset (GtkClipboard *clipboard)
|
|||||||
|
|
||||||
if (old_have_owner)
|
if (old_have_owner)
|
||||||
{
|
{
|
||||||
|
clipboard_remove_owner_notify (clipboard);
|
||||||
clipboard->have_owner = FALSE;
|
clipboard->have_owner = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -844,8 +867,6 @@ gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
|
|||||||
GdkAtom target)
|
GdkAtom target)
|
||||||
{
|
{
|
||||||
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
||||||
gchar *name;
|
|
||||||
NSData *data;
|
|
||||||
GtkSelectionData *selection_data = NULL;
|
GtkSelectionData *selection_data = NULL;
|
||||||
|
|
||||||
if (target == gdk_atom_intern_static_string ("TARGETS"))
|
if (target == gdk_atom_intern_static_string ("TARGETS"))
|
||||||
|
Loading…
Reference in New Issue
Block a user