From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 11 Feb 2011 14:59:50 +0000 (+0100)
Subject: [broadway] Update to new GDK backend APIs
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d8f061ad42a52b626785d655af5d07a4cb7c7d98;p=~andy%2Fgtk

[broadway] Update to new GDK backend APIs
---

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index c71118ea4..fa89a8cfd 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -712,22 +712,6 @@ gdk_broadway_display_list_devices (GdkDisplay *display)
   return GDK_BROADWAY_DISPLAY (display)->input_devices;
 }
 
-static gboolean
-gdk_broadway_display_send_client_message (GdkDisplay     *display,
-					  GdkEvent       *event,
-					  GdkNativeWindow winid)
-{
-  return FALSE;
-}
-
-static void
-gdk_broadway_display_add_client_message_filter (GdkDisplay   *display,
-						GdkAtom       message_type,
-						GdkFilterFunc func,
-						gpointer      data)
-{
-}
-
 static gulong
 gdk_broadway_display_get_next_serial (GdkDisplay *display)
 {
@@ -777,9 +761,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
   display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes;
   display_class->supports_composite = gdk_broadway_display_supports_composite;
   display_class->list_devices = gdk_broadway_display_list_devices;
-  display_class->send_client_message = gdk_broadway_display_send_client_message;
-  display_class->add_client_message_filter = gdk_broadway_display_add_client_message_filter;
-  display_class->get_drag_protocol = _gdk_broadway_display_get_drag_protocol;
   display_class->get_cursor_for_type = _gdk_broadway_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_broadway_display_get_cursor_for_name;
   display_class->get_cursor_for_pixbuf = _gdk_broadway_display_get_cursor_for_pixbuf;
diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c
index b5e5850f8..cf07081b8 100644
--- a/gdk/broadway/gdkdnd-broadway.c
+++ b/gdk/broadway/gdkdnd-broadway.c
@@ -102,13 +102,11 @@ _gdk_broadway_window_drag_begin (GdkWindow *window,
   return new_context;
 }
 
-GdkNativeWindow
-_gdk_broadway_display_get_drag_protocol (GdkDisplay      *display,
-					 GdkNativeWindow  xid,
-					 GdkDragProtocol *protocol,
-					 guint           *version)
+GdkDragProtocol
+_gdk_broadway_window_get_drag_protocol (GdkWindow *window,
+					GdkWindow **target)
 {
-  return 0;
+  return GDK_DRAG_PROTO_NONE;
 }
 
 static GdkWindow *
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index efc0f778c..2ddba0846 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -128,10 +128,8 @@ void _gdk_broadway_screen_init_visuals (GdkScreen *screen);
 void _gdk_broadway_display_init_dnd (GdkDisplay *display);
 GdkDisplay * _gdk_broadway_display_open (const gchar *display_name);
 void _gdk_broadway_display_queue_events (GdkDisplay *display);
-GdkNativeWindow _gdk_broadway_display_get_drag_protocol (GdkDisplay      *display,
-							 GdkNativeWindow  xid,
-							 GdkDragProtocol *protocol,
-							 guint           *version);
+GdkDragProtocol _gdk_broadway_window_get_drag_protocol (GdkWindow *window,
+							GdkWindow **target);
 GdkCursor*_gdk_broadway_display_get_cursor_for_type (GdkDisplay    *display,
 						     GdkCursorType  cursor_type);
 GdkCursor*_gdk_broadway_display_get_cursor_for_name (GdkDisplay  *display,
@@ -170,7 +168,7 @@ gint _gdk_broadway_display_get_selection_property (GdkDisplay *display,
 						   GdkAtom    *ret_type,
 						   gint       *ret_format);
 void _gdk_broadway_display_send_selection_notify (GdkDisplay       *display,
-						  GdkNativeWindow  requestor,
+						  GdkWindow       *requestor,
 						  GdkAtom          selection,
 						  GdkAtom          target,
 						  GdkAtom          property, 
diff --git a/gdk/broadway/gdkselection-broadway.c b/gdk/broadway/gdkselection-broadway.c
index 4ff962199..15cdc9bf0 100644
--- a/gdk/broadway/gdkselection-broadway.c
+++ b/gdk/broadway/gdkselection-broadway.c
@@ -113,8 +113,8 @@ _gdk_broadway_display_get_selection_property (GdkDisplay *display,
 }
 
 void
-_gdk_broadway_display_send_selection_notify (GdkDisplay       *display,
-					     GdkNativeWindow  requestor,
+_gdk_broadway_display_send_selection_notify (GdkDisplay      *display,
+					     GdkWindow       *requestor,
 					     GdkAtom          selection,
 					     GdkAtom          target,
 					     GdkAtom          property, 
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 438d95357..9a909c412 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -1387,4 +1387,5 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->get_property = _gdk_broadway_window_get_property;
   impl_class->change_property = _gdk_broadway_window_change_property;
   impl_class->delete_property = _gdk_broadway_window_delete_property;
+  impl_class->get_drag_protocol = _gdk_broadway_window_get_drag_protocol;
 }