summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2017-01-09 17:54:37 -0500
committerWilliam Hua <william.hua@canonical.com>2017-01-09 17:55:31 -0500
commit57a11ca28defaf91b9316537033cad92a8893bdb (patch)
treefbded4c5462fce6ec3c32a694a9ee65e2abcb45b
parent0b7542bad11431a60e6341b20b32afc7014b5da8 (diff)
downloadgtk+-57a11ca28defaf91b9316537033cad92a8893bdb.tar.gz
mir: fix compile-time warnings
-rw-r--r--gdk/mir/gdkmir-debug.c10
-rw-r--r--gdk/mir/gdkmireventsource.c2
-rw-r--r--gdk/mir/gdkmirscreen.c4
3 files changed, 16 insertions, 0 deletions
diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
index 7dd54d5cb7..b0ff92985f 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 a2a1a128b7..d3c85b9614 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 a723084919..daeda30361 100644
--- a/gdk/mir/gdkmirscreen.c
+++ b/gdk/mir/gdkmirscreen.c
@@ -280,6 +280,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);
}
}