[gtk+/gtk-3-22] mir: try mir before x11

[William Hua <williamhua src gnome org>]

commit 05a060c6a6f6762ede5392fa9a763034ca9140c1
Author: William Hua <william hua canonical com>
Date:   Fri Mar 10 10:50:23 2017 -0500

    mir: try mir before x11

 gdk/gdkdisplaymanager.c |    6 +++---
 gdk/mir/gdkmirdisplay.c |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index cbb5c4c..bbd7680 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -273,12 +273,12 @@ static GdkBackend gdk_backends[] = {
 #ifdef GDK_WINDOWING_WAYLAND
   { "wayland",  _gdk_wayland_display_open },
 #endif
+#ifdef GDK_WINDOWING_MIR
+  { "mir",      _gdk_mir_display_open },
+#endif
 #ifdef GDK_WINDOWING_X11
   { "x11",      _gdk_x11_display_open },
 #endif
-#ifdef GDK_WINDOWING_MIR
-  { "mir",  _gdk_mir_display_open },
-#endif
 #ifdef GDK_WINDOWING_BROADWAY
   { "broadway", _gdk_broadway_display_open },
 #endif
diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
index 1f4e73e..570932f 100644
--- a/gdk/mir/gdkmirdisplay.c
+++ b/gdk/mir/gdkmirdisplay.c
@@ -131,7 +131,6 @@ _gdk_mir_display_open (const gchar *display_name)
 
   if (!mir_connection_is_valid (connection))
     {
-      g_printerr ("Failed to connect to Mir: %s\n", mir_connection_get_error_message (connection));
       mir_connection_release (connection);
       return NULL;
     }