From b1fa791169054357bfd754446f95e9c3b7e754b2 Mon Sep 17 00:00:00 2001 From: "A. Walton" Date: Mon, 5 May 2008 19:21:59 +0000 Subject: [PATCH] reviewed by: Cosimo Cecchi 2008-05-05 A. Walton reviewed by: Cosimo Cecchi * libnautilus-private/nautilus-module.c (nautilus_module_load): * src/file-manager/fm-ditem-page.c (save_entry): * src/nautilus-autorun-software.c (autorun): Fixes build on toolchains with -Wformat enabled. Closes bug #531562. svn path=/trunk/; revision=14140 --- ChangeLog | 10 ++++++++++ libnautilus-private/nautilus-module.c | 4 ++-- src/file-manager/fm-ditem-page.c | 2 +- src/nautilus-autorun-software.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ac751c0..34355c555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-05-05 A. Walton + + reviewed by: Cosimo Cecchi + + * libnautilus-private/nautilus-module.c (nautilus_module_load): + * src/file-manager/fm-ditem-page.c (save_entry): + * src/nautilus-autorun-software.c (autorun): + Fixes build on toolchains with -Wformat enabled. + Closes bug #531562. + 2008-05-05 A. Walton * src/nautilus-window-menus.c (action_about_nautilus_callback): diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c index 33b39bb71..adf045c81 100644 --- a/libnautilus-private/nautilus-module.c +++ b/libnautilus-private/nautilus-module.c @@ -76,7 +76,7 @@ nautilus_module_load (GTypeModule *gmodule) module->library = g_module_open (module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (!module->library) { - g_warning (g_module_error ()); + g_warning ("%s", g_module_error ()); return FALSE; } @@ -90,7 +90,7 @@ nautilus_module_load (GTypeModule *gmodule) "nautilus_module_list_types", (gpointer *)&module->list_types)) { - g_warning (g_module_error ()); + g_warning ("%s", g_module_error ()); g_module_close (module->library); return FALSE; diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c index fdb2e04f8..0af048778 100644 --- a/src/file-manager/fm-ditem-page.c +++ b/src/file-manager/fm-ditem-page.c @@ -191,7 +191,7 @@ save_entry (GtkEntry *entry, GnomeDesktopItem *item) error = NULL; if (!gnome_desktop_item_save (item, NULL, TRUE, &error)) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } } diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c index 63616e3a9..0c08d82a9 100644 --- a/src/nautilus-autorun-software.c +++ b/src/nautilus-autorun-software.c @@ -166,7 +166,7 @@ out: GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error autorunning software")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error_string); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error_string); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); g_free (error_string); -- GitLab