From 435c8c9f0d6a277ec77cd62e90b35aa27635793b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 28 Feb 2016 12:18:36 -0500
Subject: [PATCH] gtk-demo: Strip newlines from g_warning and g_error

g_logv adds one for us already.
---
 demos/gtk-demo/glarea.c            | 4 ++--
 demos/gtk-demo/main.c              | 4 ++--
 demos/gtk-demo/offscreen_window.c  | 2 +-
 demos/gtk-demo/offscreen_window2.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index c267706281..3aba7295ee 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -77,7 +77,7 @@ create_shader (int         type,
       buffer = g_malloc (log_len + 1);
       glGetShaderInfoLog (shader, log_len, NULL, buffer);
 
-      g_warning ("Compile failure in %s shader:\n%s\n",
+      g_warning ("Compile failure in %s shader:\n%s",
                  type == GL_VERTEX_SHADER ? "vertex" : "fragment",
                  buffer);
 
@@ -140,7 +140,7 @@ init_shaders (GLuint *program_out,
       buffer = g_malloc (log_len + 1);
       glGetProgramInfoLog (program, log_len, NULL, buffer);
 
-      g_warning ("Linking failure:\n%s\n", buffer);
+      g_warning ("Linking failure:\n%s", buffer);
 
       g_free (buffer);
 
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 3d21832e37..a6adc6a52f 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -587,7 +587,7 @@ add_data_tab (const gchar *demoname)
             }
           else
             {
-              g_warning ("Don't know how to display resource '%s'\n", resource_name);
+              g_warning ("Don't know how to display resource '%s'", resource_name);
               widget = NULL;
             }
 
@@ -657,7 +657,7 @@ load_file (const gchar *demoname,
 
   if (bytes == NULL)
     {
-      g_warning ("Cannot open source for %s: %s\n", filename, err->message);
+      g_warning ("Cannot open source for %s: %s", filename, err->message);
       g_error_free (err);
       return;
     }
diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index 38d4cccb61..acd4c41901 100644
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -328,7 +328,7 @@ gtk_rotated_bin_add (GtkContainer *container,
       bin->child = widget;
     }
   else
-    g_warning ("GtkRotatedBin cannot have more than one child\n");
+    g_warning ("GtkRotatedBin cannot have more than one child");
 }
 
 static void
diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index f29fd9b78c..5c16c4051a 100644
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -267,7 +267,7 @@ gtk_mirror_bin_add (GtkContainer *container,
       bin->child = widget;
     }
   else
-    g_warning ("GtkMirrorBin cannot have more than one child\n");
+    g_warning ("GtkMirrorBin cannot have more than one child");
 }
 
 static void