X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkdnd.h;h=3954c0d1303dbcaba29f5f9e15e8f8265484c215;hb=0e708700efb7d6968f78355eacf93608dca2c9fc;hp=c3dd4d1c32ee0bd245ea1fb1dc48fe00d4b6042f;hpb=101d44881c27931cba352180d919488df5cd3b7b;p=~andy%2Fgtk

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index c3dd4d1c3..3954c0d13 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -88,27 +88,42 @@ void             gdk_drag_context_unref      (GdkDragContext *context);
 
 void             gdk_drag_status        (GdkDragContext   *context,
 				         GdkDragAction     action,
-					 guint32           time);
+					 guint32           time_);
 void             gdk_drop_reply         (GdkDragContext   *context,
 					 gboolean          ok,
-					 guint32           time);
+					 guint32           time_);
 void             gdk_drop_finish        (GdkDragContext   *context,
 					 gboolean          success,
-					 guint32           time);
+					 guint32           time_);
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
 
 /* Source side */
 
 GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
 				      GList          *targets);
-guint32         gdk_drag_get_protocol (guint32          xid,
-				       GdkDragProtocol *protocol);
-void             gdk_drag_find_window (GdkDragContext   *context,
-				       GdkWindow       *drag_window,
-			 	       gint             x_root,
-				       gint             y_root,
-				       GdkWindow      **dest_window,
-				       GdkDragProtocol *protocol);
+
+guint32 gdk_drag_get_protocol_for_display (GdkDisplay       *display,
+					   guint32           xid,
+					   GdkDragProtocol  *protocol);
+void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
+					   GdkWindow        *drag_window,
+					   GdkScreen        *screen,
+					   gint              x_root,
+					   gint              y_root,
+					   GdkWindow       **dest_window,
+					   GdkDragProtocol  *protocol);
+
+#ifndef GDK_MULTIHEAD_SAFE
+guint32 gdk_drag_get_protocol (guint32           xid,
+			       GdkDragProtocol  *protocol);
+void    gdk_drag_find_window  (GdkDragContext   *context,
+			       GdkWindow        *drag_window,
+			       gint              x_root,
+			       gint              y_root,
+			       GdkWindow       **dest_window,
+			       GdkDragProtocol  *protocol);
+#endif /* GDK_MULTIHEAD_SAFE */
+
 gboolean        gdk_drag_motion      (GdkDragContext *context,
 				      GdkWindow      *dest_window,
 				      GdkDragProtocol protocol,
@@ -116,11 +131,11 @@ gboolean        gdk_drag_motion      (GdkDragContext *context,
 				      gint            y_root,
 				      GdkDragAction   suggested_action,
 				      GdkDragAction   possible_actions,
-				      guint32         time);
+				      guint32         time_);
 void            gdk_drag_drop        (GdkDragContext *context,
-				      guint32         time);
+				      guint32         time_);
 void            gdk_drag_abort       (GdkDragContext *context,
-				      guint32         time);
+				      guint32         time_);
 
 #ifdef __cplusplus
 }