diff --git a/ChangeLog b/ChangeLog index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4ca3e9dd8..60e1c2d36 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Aug 14 08:07:53 2002 HideToshi Tajima + + * gtk/gtkselection.c (gtk_selection_init): initialize + gtk_selection_atoms only once at the 1st call. + * gdk/x11/gdkselection-x11.c (gdk_selection_property_get): + set length of selection data from number of read bytes (#90595) + 2002-08-14 Padraig O'Briain * gtk/gtktextview.c (gtk_text_view_focus): Move focus to diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 5dafa8b81..6c66d77a8 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -297,8 +297,8 @@ gdk_selection_property_get (GdkWindow *requestor, *ret_format = prop_format; /* Add on an extra byte to handle null termination. X guarantees - that t will be 1 longer than nbytes and null terminated */ - length = nbytes + 1; + that t will be 1 longer than nitems and null terminated */ + length = nitems + 1; if (data) { diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index b7abd47d0..f12e36d71 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1004,6 +1004,8 @@ gtk_selection_init (void) gtk_selection_atoms[MULTIPLE] = gdk_atom_intern ("MULTIPLE", FALSE); gtk_selection_atoms[TIMESTAMP] = gdk_atom_intern ("TIMESTAMP", FALSE); gtk_selection_atoms[TARGETS] = gdk_atom_intern ("TARGETS", FALSE); + + initialize = FALSE; } /*************************************************************