summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2015-04-07 14:33:35 (GMT)
committerWilliam Hua <william.hua@canonical.com>2015-04-07 14:38:22 (GMT)
commit61f3399f980288a9a9e4b03b50dd147a8af55a8d (patch)
treebf909143e0af2f8d4eed1633e96c7f7361cdcc2a
parent4c80ac0733289b43377b47fc846507a689747f43 (diff)
downloadgtk+-61f3399f980288a9a9e4b03b50dd147a8af55a8d.zip
gtk+-61f3399f980288a9a9e4b03b50dd147a8af55a8d.tar.xz
mir: Fix build failure due to changed API
mir_surface_set_event_handler() now takes three arguments.
-rw-r--r--gdk/mir/gdkmirwindowimpl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 666a1d0..b4767cb 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -213,7 +213,6 @@ ensure_surface_full (GdkWindow *window,
MirBufferUsage buffer_usage)
{
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- MirEventDelegate event_delegate = { event_cb, NULL };
GdkMirWindowReference *window_ref;
if (impl->surface || should_render_in_parent (window))
@@ -224,8 +223,6 @@ ensure_surface_full (GdkWindow *window,
*/
window_ref = _gdk_mir_event_source_get_window_reference (window);
- event_delegate.context = window_ref;
-
impl->surface = create_mir_surface (gdk_window_get_display (window),
window->width, window->height,
buffer_usage);
@@ -240,7 +237,7 @@ ensure_surface_full (GdkWindow *window,
_gdk_mir_event_source_queue (window_ref, &resize_event);
- mir_surface_set_event_handler (impl->surface, &event_delegate); // FIXME: Ignore some events until shown
+ mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until shown
set_surface_type (impl, impl->surface_type);
set_surface_state (impl, impl->surface_state);
}