summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--defaults/gconf-defaults.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e78913d9..0817b720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-22 Christian Persch <chpe@gnome.org>
+ * defaults/gconf-defaults.c: (do_copy),
+ (gconf_defaults_unset_mandatory): Fix some 'format not a string
+ literal and no format arguments' warnings.
+
+2008-10-22 Christian Persch <chpe@gnome.org>
+
* gconf/gconf-backend.c: (gconf_backend_unref): Fix one 'format not a
string literal and no format arguments' warning.
diff --git a/defaults/gconf-defaults.c b/defaults/gconf-defaults.c
index 295f5db0..c16f2e50 100644
--- a/defaults/gconf-defaults.c
+++ b/defaults/gconf-defaults.c
@@ -568,9 +568,9 @@ cleanup:
if (error) {
g_print ("failed to set GConf values: %s\n", error->message);
- error2 = g_error_new (GCONF_DEFAULTS_ERROR,
- GCONF_DEFAULTS_ERROR_GENERAL,
- error->message);
+ error2 = g_error_new_literal (GCONF_DEFAULTS_ERROR,
+ GCONF_DEFAULTS_ERROR_GENERAL,
+ error->message);
g_error_free (error);
dbus_g_method_return_error (context, error2);
@@ -738,9 +738,9 @@ gconf_defaults_unset_mandatory (GConfDefaults *mechanism,
includes, excludes, &error);
if (error) {
- error2 = g_error_new (GCONF_DEFAULTS_ERROR,
- GCONF_DEFAULTS_ERROR_GENERAL,
- error->message);
+ error2 = g_error_new_literal (GCONF_DEFAULTS_ERROR,
+ GCONF_DEFAULTS_ERROR_GENERAL,
+ error->message);
g_error_free (error);
dbus_g_method_return_error (context, error2);