widget: Remove time argument from drag_data_get() vfunc

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 47ca5057d5f92ec11a48e76dbab8b5f30b770d43..bdea28dbb3555fd6690a4f1faf3df63ad4891c49 100644 (file)
--- 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 c9ee2e8448cf41f58cd8323ace9d186a9c6e3732..409695d03bfc6d52d0b73dace403a608aa8de03e 100644 (file)
--- 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 f946ced91d8bad274445ca1693d060b260614112..1ccbed01c53cb415a1b2d4d3eee469b86faf040b 100644 (file)
--- 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 11a992f51fd5ea8e469c4531e066bec9f3ab7dbb..78eec0e16dc479dbd947bcf952a2837c70bc9f90 100644 (file)
--- 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 2de614e2a168a196bd7582a5a6dfe008882280f9..5fd2b11e66367159e690b433485b2b284cef6b8b 100644 (file)
--- 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 0e65293fccb3c1ecc5213cdb6fe49bd73427f940..f81aa70ae23ff7feba4ad430b50fc788cac70bb2 100644 (file)
--- 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 47f972216312055cd46405faae6010c407e7d016..75de722cbb012fa60c79af4b94df47fef13cd721 100644 (file)
--- 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 63d8147cfaadc095387f9f8dae629589793b72f9..4abc8e529aa85d53f0d2ad744e7d085669820d6c 100644 (file)
--- 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 136abcba43e0fb17a7602c569c4b476d630df9be..e361b1ba36bcb6ed67cf0049307487b7c036cb66 100644 (file)
--- 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 42fa0a238b0fb692ef2d54bc6eb5b86a545d64f3..51d7c58b43c9fed9bc49e14b993c997b260e5748 100644 (file)
--- 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 edd509031af9626c27909b33f5a61abdaf074d3b..322feb18b6f877cb5226ee075c8b1ffd7d99380f 100644 (file)
--- 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 b9e3b81ba2524454667c71b9eaa4f6310b1a0378..9b8eb574a494e7ad71ca0eb08b9111867d0fd706 100644 (file)
--- 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 af8809a24f25b5b7abffc0db162d1f328a9c2e27..c4d98ab4e5437322db721c09d818a4cbcc7a4cf4 100644 (file)
--- 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 e2371b6b7c71888e6d2e603cc1b26e6c2c050042..d242059ffd6b27830f2972760783e759ac6e83e1 100644 (file)
--- 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 b763a6659f9728cc568a730be96989070cee3656..f77f60d3a8c86949058e2fa13c13159a67a0e5c5 100644 (file)
--- 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 a9768dde1cb1d0b8c0a4c68d45a870751e9898cb..8b67e62ec1039647976625d893ac682ed1136972 100644 (file)
--- 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 5d54aaac8b6a3bdbabed37801534177ffa0ca41a..5989923f6693a38c81cd45d17d1c2e94fedfdcd6 100644 (file)
--- 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 26cbfe1e21ac54a018a4ac4ba5644f6f607f99ff..53fb07788b3185b4621922d297a482ad91ac573e 100644 (file)
--- 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 cd9dcee51f1567f541b91eb2b3cbe1d18c83ada2..613caa8c8cff34d044bbbeaca92039537e1fa410 100644 (file)
--- 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 3ef25e7e92f1d3a6f2d1a1be98e1302a64b25c3e..245ab1da2caf3c73d43d31eb9d647a118b0471b9 100644 (file)
--- 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 2b222f9547a14de5c66c300771816c34700d5834..4001bd67fbdd14777e79077fabcbe5d278eb15dd 100644 (file)
--- 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 b97c2a38c181f40cbd7f5d38151fb10f643b8a72..13c8a94e5a213ab8293cf45ee274bd6a04e62c02 100644 (file)
--- 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,