From: Jim Evins <evins@snaught.com>
Date: Thu, 8 Jan 2009 04:28:31 +0000 (+0000)
Subject: 2009-01-07  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_2_5~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad51cdd46a8bdcb13c0bc4637e81a6d1e80de92c;p=glabels

2009-01-07  Jim Evins  <evins@snaught.com>

	* src/critical-error-handler.c: (critical_error_handler):
	* src/ui-commands.c: (gl_ui_cmd_help_contents):
	* src/warning-handler.c: (warning_handler):
	* src/view.c: (selection_received_cb):
		Compile without warning with additional CFLAGS of
		-O1 -Wall -Wformat=2.


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@822 f5e0f49d-192f-0410-a22d-a8d8700d0965
---

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 0ce0c485..5946352d 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-07  Jim Evins  <evins@snaught.com>
+
+	* src/critical-error-handler.c: (critical_error_handler):
+	* src/ui-commands.c: (gl_ui_cmd_help_contents):
+	* src/warning-handler.c: (warning_handler):
+	* src/view.c: (selection_received_cb):
+		Compile without warning with additional CFLAGS of
+		-O1 -Wall -Wformat=2.
+	
 2009-01-02  Jim Evins  <evins@snaught.com>
 
 	* COPYING.README_FIRST:
diff --git a/glabels2/src/critical-error-handler.c b/glabels2/src/critical-error-handler.c
index c35c4e17..69a88665 100644
--- a/glabels2/src/critical-error-handler.c
+++ b/glabels2/src/critical-error-handler.c
@@ -72,7 +72,7 @@ critical_error_handler (const gchar    *log_domain,
                                          GTK_BUTTONS_NONE,
                                          _("gLabels Fatal Error!"));
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                  message);
+                                                  "%s", message);
         gtk_dialog_add_button (GTK_DIALOG (dialog),
                                GTK_STOCK_QUIT, 0);
 
diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c
index ddeb2dd1..eb3b342c 100644
--- a/glabels2/src/ui-commands.c
+++ b/glabels2/src/ui-commands.c
@@ -1058,7 +1058,7 @@ gl_ui_cmd_help_contents (GtkAction *action,
         
         if (error != NULL)
         {
-                g_message (error->message);
+                g_message ("%s", error->message);
 
                 g_error_free (error);
         }
diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index eb3bfc67..f7ad1850 100644
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -2768,7 +2768,6 @@ selection_received_cb (GtkWidget        *widget,
 	glXMLLabelStatus  status;
 	GList            *p, *p_next;
 	glLabelObject    *object, *newobject;
-	glViewObject     *view_object;
 
 	gl_debug (DEBUG_VIEW, "START");
 
diff --git a/glabels2/src/warning-handler.c b/glabels2/src/warning-handler.c
index caa8b1f9..84e32441 100644
--- a/glabels2/src/warning-handler.c
+++ b/glabels2/src/warning-handler.c
@@ -72,7 +72,7 @@ warning_handler (const gchar    *log_domain,
                                          GTK_BUTTONS_CLOSE,
                                          _("gLabels Error!"));
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                  message);
+                                                  "%s", message);
 
         gtk_dialog_run (GTK_DIALOG (dialog));