callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't accept n_targets == -1. (clipboard_unset): unref the old_data, not

Browse Source 
2005-03-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):
	Don't accept n_targets == -1.
	(clipboard_unset): unref the old_data, not the
	user_data which we have just cleared.  (#172038, Sven
	Neumann)
This commit is contained in:
Matthias Clasen
2005-03-30 17:37:42 +00:00
committed by Matthias Clasen
parent 118003400a
commit dd58d23390
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com> 2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):
Don't accept n_targets == -1.
(clipboard_unset): unref the old_data, not the
user_data which we have just cleared. (#172038, Sven
Neumann)
* gtk/gtkcombobox.c (gtk_combo_box_popup): Don't * gtk/gtkcombobox.c (gtk_combo_box_popup): Don't
segfault if somebody tries to popup an unrealized segfault if somebody tries to popup an unrealized
combo box. (#172031, Felipe Heidrich) combo box. (#172031, Felipe Heidrich)

6
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com> 2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):
Don't accept n_targets == -1.
(clipboard_unset): unref the old_data, not the
user_data which we have just cleared. (#172038, Sven
Neumann)
* gtk/gtkcombobox.c (gtk_combo_box_popup): Don't * gtk/gtkcombobox.c (gtk_combo_box_popup): Don't
segfault if somebody tries to popup an unrealized segfault if somebody tries to popup an unrealized
combo box. (#172031, Felipe Heidrich) combo box. (#172031, Felipe Heidrich)

6
ChangeLog.pre-2-8
View File

@ -1,5 +1,11 @@
2005-03-30 Matthias Clasen <mclasen@redhat.com> 2005-03-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkclipboard.c (gtk_clipboard_set_can_store):
Don't accept n_targets == -1.
(clipboard_unset): unref the old_data, not the
user_data which we have just cleared. (#172038, Sven
Neumann)
* gtk/gtkcombobox.c (gtk_combo_box_popup): Don't * gtk/gtkcombobox.c (gtk_combo_box_popup): Don't
segfault if somebody tries to popup an unrealized segfault if somebody tries to popup an unrealized
combo box. (#172031, Felipe Heidrich) combo box. (#172031, Felipe Heidrich)

3
gtk/gtkclipboard.c
View File

@ -678,7 +678,7 @@ clipboard_unset (GtkClipboard *clipboard)
*/ */
if (old_have_owner && if (old_have_owner &&
old_n_storable_targets != -1) old_n_storable_targets != -1)
g_object_unref (clipboard->user_data); g_object_unref (old_data);
} }
/** /**
@ -1609,6 +1609,7 @@ gtk_clipboard_set_can_store (GtkClipboard *clipboard,
}; };
g_return_if_fail (GTK_IS_CLIPBOARD (clipboard)); g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
g_return_if_fail (n_targets >= 0);
if (clipboard->selection != GDK_SELECTION_CLIPBOARD) if (clipboard->selection != GDK_SELECTION_CLIPBOARD)
return; return;