[gtk+] mir: warning clean-up



commit 6f340d4384a4a150d1e26dc1e0519870490c15a8
Author: William Hua <william hua canonical com>
Date:   Tue Oct 27 10:50:18 2015 -0400

    mir: warning clean-up

 gdk/mir/gdkmir-debug.c     |    2 +-
 gdk/mir/gdkmirwindowimpl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
index 8a945b2..6a2bc18 100644
--- a/gdk/mir/gdkmir-debug.c
+++ b/gdk/mir/gdkmir-debug.c
@@ -103,7 +103,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event)
 
   g_printerr ("TOUCH\n");
   g_printerr (" Device %lld\n", (long long int) mir_input_event_get_device_id (event));
-  g_printerr (" Cookie %llu %llu\n", mir_touch_event_get_cookie (touch_event).timestamp, 
mir_touch_event_get_cookie (touch_event).mac);
+  g_printerr (" Cookie %lu %lu\n", mir_touch_event_get_cookie (touch_event).timestamp, 
mir_touch_event_get_cookie (touch_event).mac);
   g_printerr (" Event Time %lld\n", (long long int) mir_input_event_get_event_time (event));
   _gdk_mir_print_modifiers (mir_touch_event_modifiers (touch_event));
   n = mir_touch_event_point_count (touch_event);
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 4690459..8455f36 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -280,12 +280,12 @@ send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
   GdkDisplay *display;
   GList *node;
 
+  display = gdk_window_get_display (window);
   gdk_event_set_device (event, device);
   gdk_event_set_source_device (event, device);
   gdk_event_set_screen (event, gdk_display_get_default_screen (display));
   event->any.window = g_object_ref (window);
 
-  display = gdk_window_get_display (window);
   node = _gdk_event_queue_append (display, event);
   _gdk_windowing_got_event (display, node, event, _gdk_display_get_next_serial (display));
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]