gnome-settings-daemon r555 - in trunk: . gnome-settings-daemon plugins/a11y-keyboard plugins/xrdb

[chpe svn gnome org]

Author: chpe
Date: Sun Oct 12 20:21:04 2008
New Revision: 555
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=555&view=rev

Log:
Bug 555553 â format not a string literal and no format arguments

Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/gnome-settings-manager.c
   trunk/gnome-settings-daemon/gnome-settings-module.c
   trunk/gnome-settings-daemon/main.c
   trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
   trunk/plugins/xrdb/gsd-xrdb-manager.c

Modified: trunk/gnome-settings-daemon/gnome-settings-manager.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-manager.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-manager.c	Sun Oct 12 20:21:04 2008
@@ -235,7 +235,7 @@
         error = NULL;
         d = g_dir_open (path, 0, &error);
         if (d == NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 g_error_free (error);
                 return;
         }

Modified: trunk/gnome-settings-daemon/gnome-settings-module.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-module.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-module.c	Sun Oct 12 20:21:04 2008
@@ -59,7 +59,7 @@
         module->library = g_module_open (module->path, 0);
 
         if (module->library == NULL) {
-                g_warning (g_module_error ());
+                g_warning ("%s", g_module_error ());
 
                 return FALSE;
         }
@@ -67,7 +67,7 @@
         /* extract symbols from the lib */
         res = g_module_symbol (module->library, "register_gnome_settings_plugin", (void *) &register_func);
         if (! res) {
-                g_warning (g_module_error ());
+                g_warning ("%s", g_module_error ());
                 g_module_close (module->library);
 
                 return FALSE;

Modified: trunk/gnome-settings-daemon/main.c
==============================================================================
--- trunk/gnome-settings-daemon/main.c	(original)
+++ trunk/gnome-settings-daemon/main.c	Sun Oct 12 20:21:04 2008
@@ -251,7 +251,7 @@
         error = NULL;
         if (! gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) {
                 if (error != NULL) {
-                        g_warning (error->message);
+                        g_warning ("%s", error->message);
                         g_error_free (error);
                 } else {
                         g_warning ("Unable to initialize GTK+");

Modified: trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
==============================================================================
--- trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(original)
+++ trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	Sun Oct 12 20:21:04 2008
@@ -606,10 +606,10 @@
                                                                 0,
                                                                 GTK_MESSAGE_WARNING,
                                                                 GTK_BUTTONS_NONE,
-                                                                title);
+                                                                "%s", title);
 
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (manager->priv->slowkeys_alert),
-                                                  message);
+                                                  "%s", message);
 
         gtk_dialog_add_button (GTK_DIALOG (manager->priv->slowkeys_alert),
                                GTK_STOCK_HELP,
@@ -751,10 +751,10 @@
                                                                   0,
                                                                   GTK_MESSAGE_WARNING,
                                                                   GTK_BUTTONS_NONE,
-                                                                  title);
+                                                                  "%s", title);
 
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (manager->priv->stickykeys_alert),
-                                                  message);
+                                                  "%s", message);
 
         gtk_dialog_add_button (GTK_DIALOG (manager->priv->stickykeys_alert),
                                GTK_STOCK_HELP,

Modified: trunk/plugins/xrdb/gsd-xrdb-manager.c
==============================================================================
--- trunk/plugins/xrdb/gsd-xrdb-manager.c	(original)
+++ trunk/plugins/xrdb/gsd-xrdb-manager.c	Sun Oct 12 20:21:04 2008
@@ -440,7 +440,7 @@
         error = NULL;
         list = scan_for_files (manager, &error);
         if (error != NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 g_error_free (error);
         }
 
@@ -448,7 +448,7 @@
                 error = NULL;
                 append_file (p->data, string, &error);
                 if (error != NULL) {
-                        g_warning (error->message);
+                        g_warning ("%s", error->message);
                         g_error_free (error);
                 }
         }
@@ -459,14 +459,14 @@
         error = NULL;
         append_xresource_file (USER_X_RESOURCES, string, &error);
         if (error != NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 g_error_free (error);
         }
 
         error = NULL;
         append_xresource_file (USER_X_DEFAULTS, string, &error);
         if (error != NULL) {
-                g_warning (error->message);
+                g_warning ("%s", error->message);
                 g_error_free (error);
         }