[gtk+/gtk-3-22] mir: fix compile-time warnings
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-22] mir: fix compile-time warnings
- Date: Mon, 23 Jan 2017 15:35:40 +0000 (UTC)
commit a95feb498409b42d7b7dd08b2c89c98b70b0a9fe
Author: William Hua <william hua canonical com>
Date: Mon Jan 9 17:54:37 2017 -0500
mir: fix compile-time warnings
gdk/mir/gdkmir-debug.c | 10 ++++++++++
gdk/mir/gdkmireventsource.c | 2 ++
gdk/mir/gdkmirscreen.c | 4 ++++
3 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
index 7dd54d5..b0ff929 100644
--- a/gdk/mir/gdkmir-debug.c
+++ b/gdk/mir/gdkmir-debug.c
@@ -127,6 +127,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event)
}
switch (mir_touch_event_tooltype (touch_event, i))
{
+ default:
case mir_touch_tooltype_unknown:
g_printerr (" ? ");
break;
@@ -200,6 +201,12 @@ _gdk_mir_print_motion_event (const MirInputEvent *event)
}
static void
+_gdk_mir_print_input_event (const MirInputEvent *event)
+{
+ g_printerr ("INPUT\n");
+}
+
+static void
_gdk_mir_print_surface_event (const MirSurfaceEvent *event)
{
g_printerr ("SURFACE\n");
@@ -260,6 +267,9 @@ _gdk_mir_print_event (const MirEvent *event)
case mir_input_event_type_pointer:
_gdk_mir_print_motion_event (mir_event_get_input_event (event));
break;
+ default:
+ _gdk_mir_print_input_event (mir_event_get_input_event (event));
+ break;
}
break;
case mir_event_type_key:
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index a2a1a12..d3c85b9 100644
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -571,6 +571,8 @@ gdk_mir_event_source_queue_event (GdkDisplay *display,
case mir_input_event_type_pointer:
handle_motion_event (window, input_event);
break;
+ default:
+ break;
}
break;
diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
index b369b03..979f2ba 100644
--- a/gdk/mir/gdkmirscreen.c
+++ b/gdk/mir/gdkmirscreen.c
@@ -354,6 +354,10 @@ gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
return g_strdup_printf ("eDP-%u", output->output_id);
case mir_display_output_type_virtual:
return g_strdup_printf ("Virtual-%u", output->output_id);
+ case mir_display_output_type_dsi:
+ return g_strdup_printf ("DSI-%u", output->output_id);
+ case mir_display_output_type_dpi:
+ return g_strdup_printf ("DPI-%u", output->output_id);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]