dnd: Remove unused time arguments

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index dcabb34d739a561c19a7491195392acd009139af..9380172f744b32d09ad39a3cfa70e501f0a2678a 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -404,7 +404,6 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
   /**
    * GdkDragContext::drop-performed:
    * @context: The object on which the signal is emitted
-   * @time: the time at which the drop happened.
    *
    * The drag and drop operation was performed on an accepting client.
    */
@@ -414,8 +413,8 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GdkDragContextClass, drop_performed),
                   NULL, NULL,
-                  g_cclosure_marshal_VOID__INT,
-                  G_TYPE_NONE, 1, G_TYPE_INT);
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 
   /**
    * GdkDragContext::dnd-finished:

diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c
index db2ac1e27d84fba1f7ec549858be210b3de853f8..36c0c9b13844e3d3612e2431997251b9b001b304 100644 (file)
--- a/gdk/wayland/gdkdnd-wayland.c
+++ b/gdk/wayland/gdkdnd-wayland.c
@@ -323,7 +323,7 @@ data_source_dnd_drop_performed (void                  *data,
 {
   GdkDragContext *context = data;
 
-  g_signal_emit_by_name (context, "drop-performed", GDK_CURRENT_TIME);
+  g_signal_emit_by_name (context, "drop-performed");
 }
 
 static void

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 0a7d01e08dec925e7b945ade40cb6bc523b1e087..f605171ec195cf35345c1ae5a79cc4a02390470b 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -2424,8 +2424,7 @@ gdk_dnd_handle_key_event (GdkDragContext    *drag,
           if ((gdk_drag_context_get_selected_action (drag) != 0) &&
               (drag_win32->dest_window != INVALID_HANDLE_VALUE))
             {
-              g_signal_emit_by_name (drag, "drop-performed",
-                                     gdk_event_get_time ((GdkEvent *) event));
+              g_signal_emit_by_name (drag, "drop-performed");
             }
           else
             gdk_drag_context_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
@@ -2518,8 +2517,7 @@ gdk_dnd_handle_button_event (GdkDragContext       *drag,
 
   if ((gdk_drag_context_get_selected_action (drag) != 0))
     {
-      g_signal_emit_by_name (drag, "drop-performed",
-                             gdk_event_get_time ((GdkEvent *) event));
+      g_signal_emit_by_name (drag, "drop-performed");
     }
   else
     gdk_drag_context_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 87f8610cde571040a2f8c1820451cdbc3a2e9eb9..6b807812f9eb9bfe9ed1faed4a54d4ea3507fff7 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2325,8 +2325,7 @@ gdk_dnd_handle_key_event (GdkDragContext    *context,
           if ((gdk_drag_context_get_selected_action (context) != 0) &&
               (x11_context->proxy_xid != None))
             {
-              g_signal_emit_by_name (context, "drop-performed",
-                                     gdk_event_get_time ((GdkEvent *) event));
+              g_signal_emit_by_name (context, "drop-performed");
             }
           else
             gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_NO_TARGET);
@@ -2415,8 +2414,7 @@ gdk_dnd_handle_button_event (GdkDragContext       *context,
   if ((gdk_drag_context_get_selected_action (context) != 0) &&
       (x11_context->proxy_xid != None))
     {
-      g_signal_emit_by_name (context, "drop-performed",
-                             gdk_event_get_time ((GdkEvent *) event));
+      g_signal_emit_by_name (context, "drop-performed");
     }
   else
     gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_NO_TARGET);

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 1ff968ea13d5d9e1ee096137b57824837133cb08..0e65293fccb3c1ecc5213cdb6fe49bd73427f940 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -118,20 +118,16 @@ static GtkDragSourceInfo *gtk_drag_get_source_info   (GdkDragContext *context,
                                                       gboolean        create);
 static void               gtk_drag_clear_source_info (GdkDragContext *context);
 
-static void gtk_drag_drop                      (GtkDragSourceInfo *info,
-                                                guint32            time);
+static void gtk_drag_drop                      (GtkDragSourceInfo *info);
 static void gtk_drag_drop_finished             (GtkDragSourceInfo *info,
-                                                GtkDragResult      result,
-                                                guint              time);
+                                                GtkDragResult      result);
 static void gtk_drag_cancel_internal           (GtkDragSourceInfo *info,
-                                                GtkDragResult      result,
-                                                guint32            time);
+                                                GtkDragResult      result);
 
 static void gtk_drag_remove_icon               (GtkDragSourceInfo *info);
 static void gtk_drag_source_info_destroy       (GtkDragSourceInfo *info);
 
 static void gtk_drag_context_drop_performed_cb (GdkDragContext    *context,
-                                                guint              time,
                                                 GtkDragSourceInfo *info);
 static void gtk_drag_context_cancel_cb         (GdkDragContext      *context,
                                                 GdkDragCancelReason  reason,
@@ -1244,8 +1240,7 @@ gtk_drag_set_icon_default (GdkDragContext *context)
 /* Clean up from the drag, and display snapback, if necessary. */
 static void
 gtk_drag_drop_finished (GtkDragSourceInfo *info,
-                        GtkDragResult      result,
-                        guint              time)
+                        GtkDragResult      result)
 {
   gboolean success;
 
@@ -1260,8 +1255,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
 }
 
 static void
-gtk_drag_drop (GtkDragSourceInfo *info, 
-               guint32            time)
+gtk_drag_drop (GtkDragSourceInfo *info)
 {
   if (info->icon_window)
     gtk_widget_hide (info->icon_window);
@@ -1341,18 +1335,16 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
  */
 static void
 gtk_drag_cancel_internal (GtkDragSourceInfo *info,
-                          GtkDragResult      result,
-                          guint32            time)
+                          GtkDragResult      result)
 {
-  gtk_drag_drop_finished (info, result, time);
+  gtk_drag_drop_finished (info, result);
 }
 
 static void
 gtk_drag_context_drop_performed_cb (GdkDragContext    *context,
-                                    guint32            time_,
                                     GtkDragSourceInfo *info)
 {
-  gtk_drag_drop (info, time_);
+  gtk_drag_drop (info);
 }
 
 static void
@@ -1375,7 +1367,7 @@ gtk_drag_context_cancel_cb (GdkDragContext      *context,
       result = GTK_DRAG_RESULT_ERROR;
       break;
     }
-  gtk_drag_cancel_internal (info, result, GDK_CURRENT_TIME);
+  gtk_drag_cancel_internal (info, result);
 }
 
 static void
@@ -1396,10 +1388,9 @@ static gboolean
 gtk_drag_abort_timeout (gpointer data)
 {
   GtkDragSourceInfo *info = data;
-  guint32 time = GDK_CURRENT_TIME;
 
   info->drop_timeout = 0;
-  gtk_drag_drop_finished (info, GTK_DRAG_RESULT_TIMEOUT_EXPIRED, time);
+  gtk_drag_drop_finished (info, GTK_DRAG_RESULT_TIMEOUT_EXPIRED);
   
   return G_SOURCE_REMOVE;
 }
@@ -1461,5 +1452,5 @@ gtk_drag_cancel (GdkDragContext *context)
 
   info = gtk_drag_get_source_info (context, FALSE);
   if (info != NULL)
-    gtk_drag_cancel_internal (info, GTK_DRAG_RESULT_ERROR, gtk_get_current_event_time ());
+    gtk_drag_cancel_internal (info, GTK_DRAG_RESULT_ERROR);
 }