gnome-control-center r9058 - trunk/capplets/appearance

[kmaraas svn gnome org]

Author: kmaraas
Date: Sat Oct 11 13:34:47 2008
New Revision: 9058
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9058&view=rev

Log:
2008-09-24  Vincent Untz  <vuntz gnome org>

	* configure.in: post-release bump to 2.24.1.

==================== 2.24.0.1 ====================

2008-09-24  Vincent Untz  <vuntz gnome org>

Modified:
   trunk/capplets/appearance/ChangeLog
   trunk/capplets/appearance/appearance-font.c
   trunk/capplets/appearance/theme-installer.c
   trunk/capplets/appearance/theme-util.c

Modified: trunk/capplets/appearance/appearance-font.c
==============================================================================
--- trunk/capplets/appearance/appearance-font.c	(original)
+++ trunk/capplets/appearance/appearance-font.c	Sat Oct 11 13:34:47 2008
@@ -524,10 +524,11 @@
 					     GTK_DIALOG_MODAL,
 					     GTK_MESSAGE_WARNING,
 					     GTK_BUTTONS_NONE,
+					     "%s",
 					     warning_label);
 
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (warning_dialog),
-					      warning_label2);
+					      "%s", warning_label2);
 
     gtk_dialog_add_button (GTK_DIALOG (warning_dialog),
 			   _("Use previous font"), GTK_RESPONSE_CLOSE);

Modified: trunk/capplets/appearance/theme-installer.c
==============================================================================
--- trunk/capplets/appearance/theme-installer.c	(original)
+++ trunk/capplets/appearance/theme-installer.c	Sat Oct 11 13:34:47 2008
@@ -249,7 +249,7 @@
 	const gchar *engine = _("\"%s\" does not appear to be a valid theme. It may be a theme engine which you need to compile.");
 
 	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-			GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, primary);
+			GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", primary);
 	if (maybe_theme_engine)
 		gtk_message_dialog_format_secondary_text (
 				GTK_MESSAGE_DIALOG (dialog), engine, filename);
@@ -357,9 +357,10 @@
 					GTK_DIALOG_MODAL,
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
+					"%s",
 					str);
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-							  error->message);
+							  "%s", error->message);
 
 		g_free (str);
 		g_error_free (error);
@@ -394,7 +395,7 @@
 				user_message = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>", str);
 				g_free (str);
 
-				dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, user_message);
+				dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", user_message);
 
 				gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Would you like to apply it now, or keep your current theme?"));
 
@@ -444,6 +445,7 @@
 				       GTK_DIALOG_MODAL,
 				       GTK_MESSAGE_INFO,
 				       GTK_BUTTONS_OK,
+				       "%s",
 				       user_message);
 				gtk_dialog_run (GTK_DIALOG (dialog));
 			}

Modified: trunk/capplets/appearance/theme-util.c
==============================================================================
--- trunk/capplets/appearance/theme-util.c	(original)
+++ trunk/capplets/appearance/theme-util.c	Sat Oct 11 13:34:47 2008
@@ -249,7 +249,7 @@
 			GTK_MESSAGE_ERROR,
 			GTK_BUTTONS_OK,
 			_("Could not install theme engine"));
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
 
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);