diff options
author | William Hua <william.hua@canonical.com> | 2017-03-10 10:50:23 -0500 |
---|---|---|
committer | William Hua <william.hua@canonical.com> | 2017-03-12 22:40:04 -0400 |
commit | 0c1cbcfe6012a19b5b830871d267502f5d001e38 (patch) | |
tree | cebc5f50c23d3184e448f722a54a073d0d73335b | |
parent | a1eb3cb2e9a62cd77ab829ae89edf0f4be5f93f5 (diff) | |
download | gtk+-0c1cbcfe6012a19b5b830871d267502f5d001e38.tar.gz |
mir: try mir before x11
-rw-r--r-- | gdk/gdkdisplaymanager.c | 6 | ||||
-rw-r--r-- | gdk/mir/gdkmirdisplay.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 2950d80520..2bd670f399 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -272,12 +272,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 9dccb32bd6..25a3a03e67 100644 --- a/gdk/mir/gdkmirdisplay.c +++ b/gdk/mir/gdkmirdisplay.c @@ -183,7 +183,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; } |