applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

post-release bump to 2.24.1.

Browse source 
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>

svn path=/trunk/; revision=9058
This commit is contained in:
Vincent Untz 2008-10-11 13:34:47 +00:00 • committed by Kjartan Maraas
parent b67f53a8ff
commit 6a3b82a1f6
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/appearance/ChangeLog
View file

@ -1,3 +1,11 @@
2008-10-11 Kjartan Maraas <kmaraas@gnome.org>
* appearance-font.c: (application_font_to_gconf):
* theme-installer.c: (invalid_theme_dialog),
(gnome_theme_install_real):
* theme-util.c: (theme_install_file):
Fix GCC warnings from -Wformat-security.
2008-10-07 Jens Granseuer <jensgr@gmx.net> 2008-10-07 Jens Granseuer <jensgr@gmx.net>
Patch by: Matthias Clasen <mclasen@redhat.com> Patch by: Matthias Clasen <mclasen@redhat.com>

3
capplets/appearance/appearance-font.c
View file

@ -524,10 +524,11 @@ application_font_to_gconf (GConfPropertyEditor *peditor,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE, GTK_BUTTONS_NONE,
"%s",
warning_label); warning_label);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (warning_dialog), gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (warning_dialog),
warning_label2); "%s", warning_label2);
gtk_dialog_add_button (GTK_DIALOG (warning_dialog), gtk_dialog_add_button (GTK_DIALOG (warning_dialog),
_("Use previous font"), GTK_RESPONSE_CLOSE); _("Use previous font"), GTK_RESPONSE_CLOSE);

8
capplets/appearance/theme-installer.c
View file

@ -249,7 +249,7 @@ invalid_theme_dialog (const gchar *filename, gboolean maybe_theme_engine)
const gchar *engine = _("\"%s\" does not appear to be a valid theme. It may be a theme engine which you need to compile."); 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, 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) if (maybe_theme_engine)
gtk_message_dialog_format_secondary_text ( gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog), engine, filename); GTK_MESSAGE_DIALOG (dialog), engine, filename);
@ -357,9 +357,10 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, GTK_BUTTONS_OK,
"%s",
str); str);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
error->message); "%s", error->message);
g_free (str); g_free (str);
g_error_free (error); g_error_free (error);
@ -394,7 +395,7 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
user_message = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>", str); user_message = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>", str);
g_free (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?")); 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 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO, GTK_MESSAGE_INFO,
GTK_BUTTONS_OK, GTK_BUTTONS_OK,
"%s",
user_message); user_message);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
} }

2
capplets/appearance/theme-util.c
View file

@ -249,7 +249,7 @@ theme_install_file (GtkWindow *parent, const gchar *path)
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, GTK_BUTTONS_OK,
_("Could not install theme engine")); _("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_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);