From 239be66ce1c7f408315f899334fab028569f1ebd Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Sun, 7 Jan 2007 16:31:17 +0000 Subject: [PATCH] Based on patch by: Gabor Kelemen 2007-01-07 Thomas Wood Based on patch by: Gabor Kelemen * gnome-theme-installer.c: (transfer_done_cb): Fixes bug 360449 (Avoid markup in translatable messages) svn path=/trunk/; revision=7084 --- capplets/theme-switcher/ChangeLog | 7 +++++++ capplets/theme-switcher/gnome-theme-installer.c | 9 ++++++++- capplets/theme-switcher/theme-properties.glade | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 6050c992c..ca035f256 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,10 @@ +2007-01-07 Thomas Wood + + Based on patch by: Gabor Kelemen + + * gnome-theme-installer.c: (transfer_done_cb): Fixes bug 360449 (Avoid + markup in translatable messages) + 2007-01-07 Rodrigo Moya * gnome-theme-details.c (gtk_theme_update_remove_button): removed diff --git a/capplets/theme-switcher/gnome-theme-installer.c b/capplets/theme-switcher/gnome-theme-installer.c index 39881a29d..0a1de8445 100644 --- a/capplets/theme-switcher/gnome-theme-installer.c +++ b/capplets/theme-switcher/gnome-theme-installer.c @@ -458,9 +458,16 @@ transfer_done_cb (GtkWidget *dlg, gchar *path) if (theme_type == THEME_GTK || theme_type == THEME_METACITY || theme_type == THEME_ICON) { /* TODO: currently cannot apply "gnome themes" */ - theme_props->user_message=g_strdup_printf(_("The theme \"%s\" has been installed.\n\nWould you like to apply it now, or keep your current theme?"), theme_props->theme_name); + gchar* str; + + str = g_strdup_printf(_("The theme \"%s\" has been installed."), theme_props->theme_name); + theme_props->user_message=g_strdup_printf("%s", str); + g_free(str); + dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, theme_props->user_message ); + gtk_message_dialog_format_secondary_text(dialog, _("Would you like to apply it now, or keep your current theme?")); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("Keep Current Theme"), GTK_RESPONSE_CLOSE); apply_button = gtk_button_new_with_label (_("Apply New Theme")); diff --git a/capplets/theme-switcher/theme-properties.glade b/capplets/theme-switcher/theme-properties.glade index 6d21b4c8c..b27daffae 100644 --- a/capplets/theme-switcher/theme-properties.glade +++ b/capplets/theme-switcher/theme-properties.glade @@ -34,7 +34,6 @@ True - True True gtk-help True