nautilus r14140 - in trunk: . libnautilus-private src src/file-manager

[awalton svn gnome org]

Author: awalton
Date: Mon May  5 19:21:59 2008
New Revision: 14140
URL: http://svn.gnome.org/viewvc/nautilus?rev=14140&view=rev

Log:
2008-05-05  A. Walton  <awalton gnome org>

	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.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-module.c
   trunk/src/file-manager/fm-ditem-page.c
   trunk/src/nautilus-autorun-software.c

Modified: trunk/libnautilus-private/nautilus-module.c
==============================================================================
--- trunk/libnautilus-private/nautilus-module.c	(original)
+++ trunk/libnautilus-private/nautilus-module.c	Mon May  5 19:21:59 2008
@@ -76,7 +76,7 @@
 	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_list_types",
 			      (gpointer *)&module->list_types)) {
 
-		g_warning (g_module_error ());
+		g_warning ("%s", g_module_error ());
 		g_module_close (module->library);
 		
 		return FALSE;

Modified: trunk/src/file-manager/fm-ditem-page.c
==============================================================================
--- trunk/src/file-manager/fm-ditem-page.c	(original)
+++ trunk/src/file-manager/fm-ditem-page.c	Mon May  5 19:21:59 2008
@@ -191,7 +191,7 @@
 	error = NULL;
 
 	if (!gnome_desktop_item_save (item, NULL, TRUE, &error)) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);
 	}
 }

Modified: trunk/src/nautilus-autorun-software.c
==============================================================================
--- trunk/src/nautilus-autorun-software.c	(original)
+++ trunk/src/nautilus-autorun-software.c	Mon May  5 19:21:59 2008
@@ -166,7 +166,7 @@
 							     GTK_MESSAGE_ERROR,
 							     GTK_BUTTONS_OK,
 							     _("<big><b>Error autorunning software</b></big>"));
-		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);