From 697efcd4bc35ca98dd8da48d30069229472abc98 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Feb 2016 12:19:58 -0500 Subject: [PATCH] x11: Strip newlines from g_warning and g_error g_logv adds one for us already. --- gdk/x11/gdkdisplay-x11.c | 2 +- gdk/x11/gdkdnd-x11.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 248eb8af16..c58c29b9df 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -2627,7 +2627,7 @@ _gdk_x11_display_error_event (GdkDisplay *display, #ifdef G_ENABLE_DEBUG g_error ("%s", msg); #else /* !G_ENABLE_DEBUG */ - g_warning ("%s\n", msg); + g_warning ("%s", msg); _exit (1); #endif /* G_ENABLE_DEBUG */ diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 767ef32272..ed923baf1d 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -990,7 +990,7 @@ xdnd_status_filter (GdkXEvent *xev, if (!(action != 0) != !(flags & 1)) { GDK_NOTE (DND, - g_warning ("Received status event with flags not corresponding to action!\n")); + g_warning ("Received status event with flags not corresponding to action!")); action = 0; } @@ -1424,8 +1424,7 @@ xdnd_check_dest (GdkDisplay *display, else { GDK_NOTE (DND, - g_warning ("Invalid XdndProxy " - "property on window %ld\n", win)); + g_warning ("Invalid XdndProxy property on window %ld", win)); } XFree (proxy_data); @@ -1450,8 +1449,7 @@ xdnd_check_dest (GdkDisplay *display, else { GDK_NOTE (DND, - g_warning ("Invalid XdndAware " - "property on window %ld\n", win)); + g_warning ("Invalid XdndAware property on window %ld", win)); } XFree (version); -- GitLab