widget: Remove time argument from drag_data_get() vfunc

22 files changed, 20 insertions, 61 deletions

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 47ca5057d5..bdea28dbb3 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -138,7 +138,6 @@ drag_data_get (GtkWidget        *widget,
                GdkDragContext   *context,
                GtkSelectionData *selection_data,
                guint             info,
-               guint             time,
                gpointer          data)
 {
   GdkPaintable *paintable;
diff --git a/demos/icon-browser/iconbrowserwin.c b/demos/icon-browser/iconbrowserwin.c
index c9ee2e8448..409695d03b 100644
--- a/demos/icon-browser/iconbrowserwin.c
+++ b/demos/icon-browser/iconbrowserwin.c
@@ -379,7 +379,6 @@ get_image_data (GtkWidget        *widget,
                 GdkDragContext   *context,
                 GtkSelectionData *selection,
                 guint             target_info,
-                guint             time,
                 gpointer          data)
 {
   GtkWidget *image;
@@ -402,7 +401,6 @@ get_scalable_image_data (GtkWidget        *widget,
                          GdkDragContext   *context,
                          GtkSelectionData *selection,
                          guint             target_info,
-                         guint             time,
                          gpointer          data)
 {
   gchar *uris[2];
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index f946ced91d..1ccbed01c5 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -309,8 +309,7 @@ static gboolean gtk_calendar_query_tooltip  (GtkWidget        *widget,
 
 static void     gtk_calendar_drag_data_get      (GtkWidget        *widget,
                                                  GdkDragContext   *context,
-                                                 GtkSelectionData *selection_data,
-                                                 guint             time);
+                                                 GtkSelectionData *selection_data);
 static void     gtk_calendar_drag_data_received (GtkWidget        *widget,
                                                  GdkDrop          *drop,
                                                  GtkSelectionData *selection_data);
@@ -2902,8 +2901,7 @@ gtk_calendar_grab_notify (GtkWidget *widget,
 static void
 gtk_calendar_drag_data_get (GtkWidget        *widget,
                             GdkDragContext   *context,
-                            GtkSelectionData *selection_data,
-                            guint             time)
+                            GtkSelectionData *selection_data)
 {
   GtkCalendar *calendar = GTK_CALENDAR (widget);
   GtkCalendarPrivate *priv = calendar->priv;
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 11a992f51f..78eec0e16d 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -115,7 +115,6 @@ static void gtk_color_button_drag_begin    (GtkWidget        *widget,
 static void gtk_color_button_drag_data_get (GtkWidget        *widget,
                                             GdkDragContext   *context,
                                             GtkSelectionData *selection_data,
-                                            guint             time,
                                             GtkColorButton   *button);
 
 /* target side drag signals */
@@ -344,7 +343,6 @@ static void
 gtk_color_button_drag_data_get (GtkWidget        *widget,
                                 GdkDragContext   *context,
                                 GtkSelectionData *selection_data,
-                                guint             time,
                                 GtkColorButton   *button)
 {
   GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 2de614e2a1..5fd2b11e66 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -187,8 +187,7 @@ swatch_drag_begin (GtkWidget      *widget,
 static void
 swatch_drag_data_get (GtkWidget        *widget,
                       GdkDragContext   *context,
-                      GtkSelectionData *selection_data,
-                      guint             time)
+                      GtkSelectionData *selection_data)
 {
   GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
   guint16 vals[4];
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0e65293fcc..f81aa70ae2 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -268,9 +268,6 @@ gtk_drag_get_data_got_stream (GObject      *source,
  *   #GtkWidget::drag-data-received signal
  * @drop: the #GdkDrop
  * @target: the target (form of the data) to retrieve
- * @time_: a timestamp for retrieving the data. This will
- *   generally be the time received in a #GtkWidget::drag-motion
- *   or #GtkWidget::drag-drop signal
  *
  * Gets the data associated with a drag. When the data
  * is received or the retrieval fails, GTK+ will emit a
@@ -812,8 +809,7 @@ gtk_drag_content_write_mime_type_async (GdkContentProvider  *provider,
   
   g_signal_emit_by_name (content->widget, "drag-data-get",
                          content->context,
-                         &sdata,
-                         content->time);
+                         &sdata);
 
   if (sdata.length == -1)
     {
@@ -890,9 +886,6 @@ gtk_drag_begin_internal (GtkWidget          *widget,
   GdkDragContext *context;
   int dx, dy;
   GtkDragContent *content;
-  guint32 time;
-
-  time = gtk_get_current_event_time ();
 
   if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     device = gdk_device_get_associated_device (device);
@@ -910,7 +903,6 @@ gtk_drag_begin_internal (GtkWidget          *widget,
   content = g_object_new (GTK_TYPE_DRAG_CONTENT, NULL);
   content->widget = g_object_ref (widget);
   content->formats = gdk_content_formats_ref (target_list);
-  content->time = time;
 
   context = gdk_drag_begin (gtk_widget_get_surface (toplevel), device, GDK_CONTENT_PROVIDER (content), actions, dx, dy);
   if (context == NULL)
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 47f9722163..75de722cbb 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -451,8 +451,7 @@ static void     gtk_entry_drag_data_received (GtkWidget        *widget,
 					      GtkSelectionData *selection_data);
 static void     gtk_entry_drag_data_get      (GtkWidget        *widget,
 					      GdkDragContext   *context,
-					      GtkSelectionData *selection_data,
-					      guint             time);
+					      GtkSelectionData *selection_data);
 static void     gtk_entry_drag_data_delete   (GtkWidget        *widget,
 					      GdkDragContext   *context);
 static void     gtk_entry_drag_begin         (GtkWidget        *widget,
@@ -8748,8 +8747,7 @@ gtk_entry_drag_data_received (GtkWidget        *widget,
 static void
 gtk_entry_drag_data_get (GtkWidget        *widget,
 			 GdkDragContext   *context,
-			 GtkSelectionData *selection_data,
-			 guint             time)
+			 GtkSelectionData *selection_data)
 {
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 63d8147cfa..4abc8e529a 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -282,8 +282,7 @@ static void gtk_icon_view_drag_end         (GtkWidget        *widget,
                                             GdkDragContext   *context);
 static void gtk_icon_view_drag_data_get    (GtkWidget        *widget,
                                             GdkDragContext   *context,
-                                            GtkSelectionData *selection_data,
-                                            guint             time);
+                                            GtkSelectionData *selection_data);
 static void gtk_icon_view_drag_data_delete (GtkWidget        *widget,
                                             GdkDragContext   *context);
 
@@ -6128,8 +6127,7 @@ gtk_icon_view_drag_end (GtkWidget      *widget,
 static void 
 gtk_icon_view_drag_data_get (GtkWidget        *widget,
 			     GdkDragContext   *context,
-			     GtkSelectionData *selection_data,
-			     guint             time)
+			     GtkSelectionData *selection_data)
 {
   GtkIconView *icon_view;
   GtkTreeModel *model;
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 136abcba43..e361b1ba36 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -477,8 +477,7 @@ static void     gtk_label_setup_mnemonic    (GtkLabel          *label,
 					     guint              last_key);
 static void     gtk_label_drag_data_get     (GtkWidget         *widget,
 					     GdkDragContext    *context,
-					     GtkSelectionData  *selection_data,
-					     guint              time);
+					     GtkSelectionData  *selection_data);
 
 static void     gtk_label_buildable_interface_init     (GtkBuildableIface *iface);
 static gboolean gtk_label_buildable_custom_tag_start   (GtkBuildable     *buildable,
@@ -5171,8 +5170,7 @@ gtk_label_set_selection_text (GtkLabel         *label,
 static void
 gtk_label_drag_data_get (GtkWidget        *widget,
 			 GdkDragContext   *context,
-			 GtkSelectionData *selection_data,
-			 guint             time)
+			 GtkSelectionData *selection_data)
 {
   gtk_label_set_selection_text (GTK_LABEL (widget), selection_data);
 }
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 42fa0a238b..51d7c58b43 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -109,7 +109,6 @@ static gboolean gtk_link_button_popup_menu   (GtkWidget        *widget);
 static void gtk_link_button_drag_data_get_cb (GtkWidget        *widget,
 					      GdkDragContext   *context,
 					      GtkSelectionData *selection,
-					      guint             _time,
 					      gpointer          user_data);
 static gboolean gtk_link_button_query_tooltip_cb (GtkWidget    *widget,
                                                   gint          x,
@@ -436,7 +435,6 @@ static void
 gtk_link_button_drag_data_get_cb (GtkWidget        *widget,
 				  GdkDragContext   *context,
 				  GtkSelectionData *selection,
-				  guint             _time,
 				  gpointer          user_data)
 {
   GtkLinkButton *link_button = GTK_LINK_BUTTON (widget);
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index edd509031a..322feb18b6 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -75,7 +75,6 @@ VOID:INT,INT,INT
 VOID:OBJECT,BOOLEAN
 VOID:OBJECT,BOXED
 VOID:OBJECT,BOXED,BOXED
-VOID:OBJECT,BOXED,UINT
 VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN
 VOID:OBJECT,ENUM
 VOID:OBJECT,FLAGS
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index b9e3b81ba2..9b8eb574a4 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -403,8 +403,7 @@ static gboolean gtk_notebook_drag_drop       (GtkWidget        *widget,
                                               gint              y);
 static void gtk_notebook_drag_data_get       (GtkWidget        *widget,
                                               GdkDragContext   *context,
-                                              GtkSelectionData *data,
-                                              guint             time);
+                                              GtkSelectionData *data);
 static void gtk_notebook_drag_data_received  (GtkWidget        *widget,
                                               GdkDrop          *drop,
                                               GtkSelectionData *data);
@@ -3215,8 +3214,7 @@ do_detach_tab (GtkNotebook *from,
 static void
 gtk_notebook_drag_data_get (GtkWidget        *widget,
                             GdkDragContext   *context,
-                            GtkSelectionData *data,
-                            guint             time)
+                            GtkSelectionData *data)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
   GtkNotebookPrivate *priv = notebook->priv;
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index af8809a24f..c4d98ab4e5 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1288,7 +1288,6 @@ static void
 button_drag_data_get_cb (GtkWidget        *widget,
                          GdkDragContext   *context,
                          GtkSelectionData *selection_data,
-                         guint             time_,
                          gpointer          data)
 {
   ButtonData *button_data;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e2371b6b7c..d242059ffd 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -422,8 +422,7 @@ static void gtk_text_view_drag_end         (GtkWidget        *widget,
                                             GdkDragContext   *context);
 static void gtk_text_view_drag_data_get    (GtkWidget        *widget,
                                             GdkDragContext   *context,
-                                            GtkSelectionData *selection_data,
-                                            guint             time);
+                                            GtkSelectionData *selection_data);
 static void gtk_text_view_drag_data_delete (GtkWidget        *widget,
                                             GdkDragContext   *context);
 
@@ -7651,8 +7650,7 @@ gtk_text_view_drag_end (GtkWidget        *widget,
 static void
 gtk_text_view_drag_data_get (GtkWidget        *widget,
                              GdkDragContext   *context,
-                             GtkSelectionData *selection_data,
-                             guint             time)
+                             GtkSelectionData *selection_data)
 {
   GtkTextView *text_view = GTK_TEXT_VIEW (widget);
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b763a6659f..f77f60d3a8 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -623,8 +623,7 @@ static void gtk_tree_view_drag_end         (GtkWidget        *widget,
                                             GdkDragContext   *context);
 static void gtk_tree_view_drag_data_get    (GtkWidget        *widget,
                                             GdkDragContext   *context,
-                                            GtkSelectionData *selection_data,
-                                            guint             time);
+                                            GtkSelectionData *selection_data);
 static void gtk_tree_view_drag_data_delete (GtkWidget        *widget,
                                             GdkDragContext   *context);
 
@@ -7436,8 +7435,7 @@ gtk_tree_view_drag_end (GtkWidget      *widget,
 static void
 gtk_tree_view_drag_data_get (GtkWidget        *widget,
                              GdkDragContext   *context,
-                             GtkSelectionData *selection_data,
-                             guint             time)
+                             GtkSelectionData *selection_data)
 {
   GtkTreeView *tree_view;
   GtkTreeModel *model;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index a9768dde1c..8b67e62ec1 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1967,7 +1967,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * @data: the #GtkSelectionData to be filled with the dragged data
    * @info: the info that has been registered with the target in the
    *        #GtkTargetList
-   * @time: the timestamp at which the data was requested
    *
    * The ::drag-data-get signal is emitted on the drag source when the drop
    * site requests the data which is dragged. It is the responsibility of
@@ -1981,11 +1980,10 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
 		  NULL, NULL,
-		  _gtk_marshal_VOID__OBJECT_BOXED_UINT,
-		  G_TYPE_NONE, 3,
+		  _gtk_marshal_VOID__OBJECT_BOXED,
+		  G_TYPE_NONE, 2,
 		  GDK_TYPE_DRAG_CONTEXT,
-		  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
-		  G_TYPE_UINT);
+		  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   /**
    * GtkWidget::drag-data-received:
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 5d54aaac8b..5989923f66 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -299,8 +299,7 @@ struct _GtkWidgetClass
                                     GdkDragContext     *context);
   void     (* drag_data_get)       (GtkWidget          *widget,
                                     GdkDragContext     *context,
-                                    GtkSelectionData   *selection_data,
-                                    guint               time_);
+                                    GtkSelectionData   *selection_data);
   void     (* drag_data_delete)    (GtkWidget          *widget,
                                     GdkDragContext     *context);
 
diff --git a/tests/testdnd.c b/tests/testdnd.c
index 26cbfe1e21..53fb07788b 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -420,7 +420,6 @@ void
 source_drag_data_get  (GtkWidget          *widget,
 		       GdkDragContext     *context,
 		       GtkSelectionData   *selection_data,
-		       guint               time,
 		       gpointer            data)
 {
   if (gtk_selection_data_get_target (selection_data) == g_intern_static_string ("application/x-rootwindow-drop"))
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index cd9dcee51f..613caa8c8c 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -155,7 +155,6 @@ void
 image_drag_data_get (GtkWidget        *widget,
                      GdkDragContext   *context,
                      GtkSelectionData *selection_data,
-                     guint             time,
                      gpointer          data)
 {
   GdkPaintable *paintable;
@@ -312,7 +311,6 @@ void
 spinner_drag_data_get (GtkWidget        *widget,
                        GdkDragContext   *context,
                        GtkSelectionData *selection_data,
-                       guint             time,
                        gpointer          data)
 {
   g_print ("GtkWidget::drag-data-get\n");
diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 3ef25e7e92..245ab1da2c 100644
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -24,7 +24,6 @@ static void
 drag_data_get_cb (GtkWidget        *widget,
                   GdkDragContext   *context,
                   GtkSelectionData *data,
-                  guint             time,
                   gpointer          user_data)
 {
   gint pos;
diff --git a/tests/testimage.c b/tests/testimage.c
index 2b222f9547..4001bd67fb 100644
--- a/tests/testimage.c
+++ b/tests/testimage.c
@@ -34,7 +34,6 @@ void
 drag_data_get  (GtkWidget        *widget,
 		GdkDragContext   *context,
 		GtkSelectionData *selection_data,
-		guint             time,
 		gpointer          data)
 {
   GtkWidget *image = GTK_WIDGET (data);
diff --git a/tests/testlist3.c b/tests/testlist3.c
index b97c2a38c1..13c8a94e5a 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -29,7 +29,6 @@ void
 drag_data_get (GtkWidget        *widget,
                GdkDragContext   *context,
                GtkSelectionData *selection_data,
-               guint             time,
                gpointer          data)
 {
   gtk_selection_data_set (selection_data,