eog r4602 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Jun 10 07:30:22 2008
New Revision: 4602
URL: http://svn.gnome.org/viewvc/eog?rev=4602&view=rev

Log:
2008-06-10  Cosimo Cecchi  <cosimoc gnome org>

	* src/eog-image.c: (eog_image_copy_file):
	* src/eog-metadata-reader-jpg.c: (eog_metadata_reader_jpg_consume):
	* src/eog-module.c: (eog_module_load):
	* src/eog-plugin-engine.c: (eog_plugin_engine_load_dir):
	* src/eog-thumbnail.c: (set_vfs_error), (set_thumb_error):
	* src/eog-util.c: (eog_util_show_help):
	* src/eog-window.c: (eog_window_cmd_move_to_trash):
	* src/main.c: (load_files_remote):
	Fix some build warnings. Bug #537488.


Modified:
   trunk/ChangeLog
   trunk/src/eog-image.c
   trunk/src/eog-metadata-reader-jpg.c
   trunk/src/eog-module.c
   trunk/src/eog-plugin-engine.c
   trunk/src/eog-thumbnail.c
   trunk/src/eog-util.c
   trunk/src/eog-window.c
   trunk/src/main.c

Modified: trunk/src/eog-image.c
==============================================================================
--- trunk/src/eog-image.c	(original)
+++ trunk/src/eog-image.c	Tue Jun 10 07:30:22 2008
@@ -43,6 +43,7 @@
 #include "eog-thumbnail.h"
 
 #include <unistd.h>
+#include <string.h>
 
 #include <glib.h>
 #include <glib-object.h>
@@ -1536,11 +1537,11 @@
 		if (ioerror->code == G_IO_ERROR_EXISTS) {
 			g_set_error (error, EOG_IMAGE_ERROR,
 				     EOG_IMAGE_ERROR_FILE_EXISTS,
-				     ioerror->message);
+				     "%s", ioerror->message);
 		} else {
 		g_set_error (error, EOG_IMAGE_ERROR,
 			     EOG_IMAGE_ERROR_VFS, 
-			     ioerror->message);
+			     "%s", ioerror->message);
 		}
 		g_error_free (ioerror);
 	}

Modified: trunk/src/eog-metadata-reader-jpg.c
==============================================================================
--- trunk/src/eog-metadata-reader-jpg.c	(original)
+++ trunk/src/eog-metadata-reader-jpg.c	Tue Jun 10 07:30:22 2008
@@ -208,7 +208,7 @@
 	EogMetadataReaderJpgPrivate *priv;
  	EogJpegApp1Type app1_type;
 	int i;
-	EogMetadataReaderState next_state;
+	EogMetadataReaderState next_state = EMR_READ;
 	guchar *chunk = NULL;
 
 	g_return_if_fail (EOG_IS_METADATA_READER_JPG (emr));

Modified: trunk/src/eog-module.c
==============================================================================
--- trunk/src/eog-module.c	(original)
+++ trunk/src/eog-module.c	Tue Jun 10 07:30:22 2008
@@ -51,7 +51,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;
 	}
@@ -60,7 +60,7 @@
 	if (!g_module_symbol (module->library, 
 			      "register_eog_plugin",
 			      (void *) &register_func)) {
-		g_warning (g_module_error());
+		g_warning ("%s", g_module_error());
 		g_module_close (module->library);
 
 		return FALSE;

Modified: trunk/src/eog-plugin-engine.c
==============================================================================
--- trunk/src/eog-plugin-engine.c	(original)
+++ trunk/src/eog-plugin-engine.c	Tue Jun 10 07:30:22 2008
@@ -303,7 +303,7 @@
 	d = g_dir_open (dir, 0, &error);
 
 	if (!d)	{
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);
 
 		return;

Modified: trunk/src/eog-thumbnail.c
==============================================================================
--- trunk/src/eog-thumbnail.c	(original)
+++ trunk/src/eog-thumbnail.c	Tue Jun 10 07:30:22 2008
@@ -70,7 +70,7 @@
 	g_set_error (error, 
 		     EOG_THUMB_ERROR, 
 		     EOG_THUMB_ERROR_VFS,
-		     (ioerror ? ioerror->message : "VFS error making a thumbnail"));
+		     "%s", ioerror ? ioerror->message : "VFS error making a thumbnail");
 }
 
 static void
@@ -79,7 +79,7 @@
 	g_set_error (error, 
 		     EOG_THUMB_ERROR, 
 		     error_id,
-		     string);
+		     "%s", string);
 }
 
 static GdkPixbuf*

Modified: trunk/src/eog-util.c
==============================================================================
--- trunk/src/eog-util.c	(original)
+++ trunk/src/eog-util.c	Tue Jun 10 07:30:22 2008
@@ -63,7 +63,7 @@
 						 _("Could not display help for Eye of GNOME"));
 
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-							  error->message);
+							  "%s", error->message);
 
 		g_signal_connect_swapped (dialog, "response",
 					  G_CALLBACK (gtk_widget_destroy),

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Tue Jun 10 07:30:22 2008
@@ -3031,10 +3031,10 @@
 						      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						      GTK_MESSAGE_ERROR,
 						      GTK_BUTTONS_OK,
-						      header);
+						      "%s", header);
 
 			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg),
-								  error->message);
+								  "%s", error->message);
 
 			gtk_dialog_run (GTK_DIALOG (dlg));
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Jun 10 07:30:22 2008
@@ -122,7 +122,7 @@
 	connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 
 	if (connection == NULL) {
-		g_warning (error->message);
+		g_warning ("%s", error->message);
 		g_error_free (error);	
 
  		return FALSE;
@@ -141,7 +141,7 @@
  					G_TYPE_UCHAR, flags,
  					G_TYPE_INVALID,
  					G_TYPE_INVALID)) {
- 			g_warning (error->message);
+ 			g_warning ("%s", error->message);
  			g_clear_error (&error);
  
  			result = FALSE;
@@ -153,7 +153,7 @@
  					G_TYPE_UCHAR, flags,
  					G_TYPE_INVALID,
  					G_TYPE_INVALID)) {
- 			g_warning (error->message);
+ 			g_warning ("%s", error->message);
  			g_clear_error (&error);
  			
 			result = FALSE;