diff --git a/ChangeLog b/ChangeLog
index 1f3fa1a0b2..7f9276827f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-28  Christian Dywan  <christian@imendio.com>
+
+	Bug 549734 – gtk_selection_data_get_data prototype is wrong
+
+	* gtk/gtkselection.[ch] (gtk_selection_data_get_data): make the
+	'length' argument of gtk_selection_data_get_data a 'gint', that's
+	what it should be.
+
 2008-08-27  Cody Russell  <bratsche@gnome.org>
 
 	* gdk/win32/gdkevents-win32.c:
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 3002b874fc..aca1bde176 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1180,7 +1180,7 @@ gtk_selection_data_get_format (GtkSelectionData *selection_data)
  **/
 const guchar*
 gtk_selection_data_get_data (GtkSelectionData *selection_data,
-                             guint	      *length)
+                             gint             *length)
 {
   g_return_val_if_fail (selection_data != NULL, NULL);
 
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index d685b3a7f2..2d13a43f7e 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -151,7 +151,7 @@ GdkAtom       gtk_selection_data_get_target    (GtkSelectionData *selection_data
 GdkAtom       gtk_selection_data_get_data_type (GtkSelectionData *selection_data);
 gint          gtk_selection_data_get_format    (GtkSelectionData *selection_data);
 const guchar *gtk_selection_data_get_data      (GtkSelectionData *selection_data,
-                                                guint	         *length);
+                                                gint             *length);
 GdkDisplay   *gtk_selection_data_get_display   (GtkSelectionData *selection_data);
 
 void     gtk_selection_data_set      (GtkSelectionData     *selection_data,