[gtk+] x11: Strip newlines from g_warning and g_error



commit 697efcd4bc35ca98dd8da48d30069229472abc98
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 28 12:19:58 2016 -0500

    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 248eb8a..c58c29b 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 767ef32..ed923ba 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]