[gdm: 50/70] Fix format-security warning. Bug #572047.

[Ray Strode <halfline src gnome org>]

commit 9a3b2e7327cdf286e9950e14bd86244650b4eb72
Author: Frederic Crozat <fcrozat mandriva com>
Date:   Tue Feb 17 14:43:21 2009 +0000

    Fix format-security warning. Bug #572047.
    
    2009-02-17  Frederic Crozat  <fcrozat mandriva com>
    
            * gui/simple-greeter/gdm-layouts.c:
            * gui/simple-greeter/test-remote-login-window.c:
            Fix format-security warning. Bug #572047.
    
    
    svn path=/trunk/; revision=6710
---
 ChangeLog                                     |    6 ++++++
 gui/simple-greeter/gdm-layouts.c              |    4 ++--
 gui/simple-greeter/test-remote-login-window.c |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62e6750..a02a3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-17  Frederic Crozat  <fcrozat mandriva com>
+
+	* gui/simple-greeter/gdm-layouts.c:
+	* gui/simple-greeter/test-remote-login-window.c:
+	Fix format-security warning. Bug #572047.
+
 2009-02-16  Thomas H.P. Andersen  <phomes gmail com>
 
 	* gui/user-switch-applet/applet.c: (applet_change_background_cb):
diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
index 479d5ea..7f7c507 100644
--- a/gui/simple-greeter/gdm-layouts.c
+++ b/gui/simple-greeter/gdm-layouts.c
@@ -120,7 +120,7 @@ gdm_get_layout_from_name (const char *name)
 
         item = xkl_config_item_new ();
 
-        g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id1);
+        g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id1);
         if (xkl_config_registry_find_layout (config_registry, item)) {
                 layout = xci_desc_to_utf8 (item);
         } else {
@@ -128,7 +128,7 @@ gdm_get_layout_from_name (const char *name)
         }
 
         if (id2 != NULL) {
-                g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, id2);
+                g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id2);
                 if (xkl_config_registry_find_variant (config_registry, id1, item))
                         variant = xci_desc_to_utf8 (item);
                 else
diff --git a/gui/simple-greeter/test-remote-login-window.c b/gui/simple-greeter/test-remote-login-window.c
index 5a3bd1c..84d191a 100644
--- a/gui/simple-greeter/test-remote-login-window.c
+++ b/gui/simple-greeter/test-remote-login-window.c
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
         error = NULL;
         re = g_regex_new ("hostname: (?P<hostname>[a-zA-Z0-9.-]+)", 0, 0, &error);
         if (re == NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 goto out;
         }