u2004-05-03 Matthias Clasen <mclasen@redhat.com>

	* gtk/gtkselection.c (_gtk_selection_request): Fix
	a debug message to show correct information.
	(_gtk_selection_incr_event): Make INCRemental transfer
	of MULTIPLE targets work. This was broken since 1997!

diff --git a/ChangeLog b/ChangeLog
index 2c734bedf3f6968cdebdbeae2449e20af00e1061..82d5f73b93127a3c8ba94c54c1148624bb85ec43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Fix
+       a debug message to show correct information.
+       (_gtk_selection_incr_event): Make INCRemental transfer
+       of MULTIPLE targets work. This was broken since 1997!
+
 2004-05-02  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkdrawable-win32.c (draw_segments) : don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c734bedf3f6968cdebdbeae2449e20af00e1061..82d5f73b93127a3c8ba94c54c1148624bb85ec43 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Fix
+       a debug message to show correct information.
+       (_gtk_selection_incr_event): Make INCRemental transfer
+       of MULTIPLE targets work. This was broken since 1997!
+
 2004-05-02  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkdrawable-win32.c (draw_segments) : don't

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2c734bedf3f6968cdebdbeae2449e20af00e1061..82d5f73b93127a3c8ba94c54c1148624bb85ec43 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Fix
+       a debug message to show correct information.
+       (_gtk_selection_incr_event): Make INCRemental transfer
+       of MULTIPLE targets work. This was broken since 1997!
+
 2004-05-02  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkdrawable-win32.c (draw_segments) : don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2c734bedf3f6968cdebdbeae2449e20af00e1061..82d5f73b93127a3c8ba94c54c1148624bb85ec43 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Fix
+       a debug message to show correct information.
+       (_gtk_selection_incr_event): Make INCRemental transfer
+       of MULTIPLE targets work. This was broken since 1997!
+
 2004-05-02  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkdrawable-win32.c (draw_segments) : don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2c734bedf3f6968cdebdbeae2449e20af00e1061..82d5f73b93127a3c8ba94c54c1148624bb85ec43 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+u2004-05-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkselection.c (_gtk_selection_request): Fix
+       a debug message to show correct information.
+       (_gtk_selection_incr_event): Make INCRemental transfer
+       of MULTIPLE targets work. This was broken since 1997!
+
 2004-05-02  Hans Breuer  <hans@breuer.org>
 
        * gdk/win32/gdkdrawable-win32.c (draw_segments) : don't

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index a47d6925c6da8ddba914a76800bb266a78f1fd68..b768af3d3f6c64d60a4859c8f42b3bb57b0734d5 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -17,12 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* This file implements most of the work of the ICCM selection protocol.
+/* This file implements most of the work of the ICCCM selection protocol.
  * The code was written after an intensive study of the equivalent part
  * of John Ousterhout's Tk toolkit, and does many things in much the 
  * same way.
  *
- * The one thing in the ICCM that isn't fully supported here (or in Tk)
+ * The one thing in the ICCCM that isn't fully supported here (or in Tk)
  * is side effects targets. For these to be handled properly, MULTIPLE
  * targets need to be done in the order specified. This cannot be
  * guaranteed with the way we do things, since if we are doing INCR
@@ -1236,7 +1236,7 @@ _gtk_selection_request (GtkWidget *widget,
       g_message ("Selection %ld, target %ld (%s) requested by 0x%x (property = %ld)",
                 event->selection, info->conversions[i].target,
                 gdk_atom_name (info->conversions[i].target),
-                event->requestor, event->property);
+                event->requestor, info->conversions[i].property);
 #endif
       
       gtk_selection_invoke_handler (widget, &data, event->time);
@@ -1454,7 +1454,6 @@ _gtk_selection_incr_event (GdkWindow         *window,
              info->conversions[i].offset = -1;
            }
        }
-      break;
     }
   
   /* Check if we're finished with all the targets */