evince r3238 - in branches/gnome-2-24: . backend/djvu backend/ps shell

[chpe svn gnome org]

Author: chpe
Date: Mon Oct 27 12:15:33 2008
New Revision: 3238
URL: http://svn.gnome.org/viewvc/evince?rev=3238&view=rev

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

Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/backend/djvu/djvu-document.c
   branches/gnome-2-24/backend/ps/ev-spectre.c
   branches/gnome-2-24/shell/ev-jobs.c

Modified: branches/gnome-2-24/backend/djvu/djvu-document.c
==============================================================================
--- branches/gnome-2-24/backend/djvu/djvu-document.c	(original)
+++ branches/gnome-2-24/backend/djvu/djvu-document.c	Mon Oct 27 12:15:33 2008
@@ -97,9 +97,9 @@
 			}
 			
 			if (error) {
-				g_set_error (error, EV_DJVU_ERROR, 0, error_str);
+				g_set_error_literal (error, EV_DJVU_ERROR, 0, error_str);
 			} else {
-				g_warning (error_str);
+				g_warning ("%s", error_str);
 			}
 				
 			g_free (error_str);
@@ -178,10 +178,10 @@
 
 	djvu_wait_for_message (djvu_document, DDJVU_DOCINFO, &djvu_error);
 	if (djvu_error) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     djvu_error->message);
+		g_set_error_literal (error,
+				     EV_DOCUMENT_ERROR,
+				     EV_DOCUMENT_ERROR_INVALID,
+				     djvu_error->message);
 		g_error_free (djvu_error);
 		g_free (filename);
 		ddjvu_document_release (djvu_document->d_document);
@@ -194,10 +194,10 @@
 		djvu_handle_events (djvu_document, TRUE, &djvu_error);
 
 	if (djvu_error) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     EV_DOCUMENT_ERROR_INVALID,
-			     djvu_error->message);
+		g_set_error_literal (error,
+				     EV_DOCUMENT_ERROR,
+				     EV_DOCUMENT_ERROR_INVALID,
+				     djvu_error->message);
 		g_error_free (djvu_error);
 		g_free (filename);
 		ddjvu_document_release (djvu_document->d_document);

Modified: branches/gnome-2-24/backend/ps/ev-spectre.c
==============================================================================
--- branches/gnome-2-24/backend/ps/ev-spectre.c	(original)
+++ branches/gnome-2-24/backend/ps/ev-spectre.c	Mon Oct 27 12:15:33 2008
@@ -307,7 +307,7 @@
 	}
 
 	if (spectre_page_status (ps_page)) {
-		g_warning (spectre_status_to_string (spectre_page_status (ps_page)));
+		g_warning ("%s", spectre_status_to_string (spectre_page_status (ps_page)));
 		g_free (data);
 		
 		return NULL;

Modified: branches/gnome-2-24/shell/ev-jobs.c
==============================================================================
--- branches/gnome-2-24/shell/ev-jobs.c	(original)
+++ branches/gnome-2-24/shell/ev-jobs.c	Mon Oct 27 12:15:33 2008
@@ -239,7 +239,7 @@
 	message = g_strdup_vprintf (format, args);
 	va_end (args);
 	
-	job->error = g_error_new (domain, code, message);
+	job->error = g_error_new_literal (domain, code, message);
 	g_free (message);
 	
 	ev_job_emit_finished (job);