callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mir: Fix build failure due to changed API

Browse Source 
mir_surface_set_event_handler() now takes three arguments.
This commit is contained in:
William Hua
2015-04-07 10:33:35 -04:00
parent 4c80ac0733
commit 61f3399f98
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/mir/gdkmirwindowimpl.c
View File

@ -213,7 +213,6 @@ ensure_surface_full (GdkWindow *window,
MirBufferUsage buffer_usage) MirBufferUsage buffer_usage)
{ {
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl); GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
MirEventDelegate event_delegate = { event_cb, NULL };
GdkMirWindowReference *window_ref; GdkMirWindowReference *window_ref;
if (impl->surface || should_render_in_parent (window)) 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); 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), impl->surface = create_mir_surface (gdk_window_get_display (window),
window->width, window->height, window->width, window->height,
buffer_usage); buffer_usage);
@ -240,7 +237,7 @@ ensure_surface_full (GdkWindow *window,
_gdk_mir_event_source_queue (window_ref, &resize_event); _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_type (impl, impl->surface_type);
set_surface_state (impl, impl->surface_state); set_surface_state (impl, impl->surface_state);
} }