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

Fix 344743

Browse Source
This commit is contained in:
Matthias Clasen
2006-06-14 13:37:11 +00:00
parent 400101a108
commit 371c875c90
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-06-14 Matthias Clasen <mclasen@redhat.com> 2006-06-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c: Call init_atoms before using atoms
in several functions. (#344743, John Finlay)
* gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func): * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
Allow NULL to reset to default. (#344838, John Finlay) Allow NULL to reset to default. (#344838, John Finlay)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-06-14 Matthias Clasen <mclasen@redhat.com> 2006-06-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c: Call init_atoms before using atoms
in several functions. (#344743, John Finlay)
* gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func): * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
Allow NULL to reset to default. (#344838, John Finlay) Allow NULL to reset to default. (#344838, John Finlay)

8
gtk/gtkselection.c
View File

@ -1700,6 +1700,9 @@ gtk_targets_include_text (GdkAtom *targets,
/* Keep in sync with gtk_target_list_add_text_targets() /* Keep in sync with gtk_target_list_add_text_targets()
*/ */
init_atoms ();
for (i = 0; i < n_targets; i++) for (i = 0; i < n_targets; i++)
{ {
if (targets[i] == utf8_atom || if (targets[i] == utf8_atom ||
@ -1744,6 +1747,8 @@ gtk_targets_include_rich_text (GdkAtom *targets,
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
init_atoms ();
rich_targets = gtk_text_buffer_get_deserialize_formats (buffer, rich_targets = gtk_text_buffer_get_deserialize_formats (buffer,
&n_rich_targets); &n_rich_targets);
@ -1930,6 +1935,9 @@ gtk_targets_include_uri (GdkAtom *targets,
/* Keep in sync with gtk_target_list_add_uri_targets() /* Keep in sync with gtk_target_list_add_uri_targets()
*/ */
init_atoms ();
for (i = 0; i < n_targets; i++) for (i = 0; i < n_targets; i++)
{ {
if (targets[i] == text_uri_list_atom) if (targets[i] == text_uri_list_atom)