Based on patch by: Gabor Kelemen <kelemeng@gnome.hu>

2007-01-07  Thomas Wood  <thos@gnome.org>

	Based on patch by: Gabor Kelemen <kelemeng@gnome.hu>

	* gnome-theme-installer.c: (transfer_done_cb): Fixes bug 360449 (Avoid
	markup in translatable messages)

svn path=/trunk/; revision=7084
This commit is contained in:
Thomas Wood 2007-01-07 16:31:17 +00:00 committed by Thomas Wood
parent 1e8514a258
commit 239be66ce1
3 changed files with 15 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2007-01-07 Thomas Wood <thos@gnome.org>
Based on patch by: Gabor Kelemen <kelemeng@gnome.hu>
* gnome-theme-installer.c: (transfer_done_cb): Fixes bug 360449 (Avoid
markup in translatable messages)
2007-01-07 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-theme-details.c (gtk_theme_update_remove_button): removed

View file

@ -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(_("<span weight=\"bold\" size=\"larger\">The theme \"%s\" has been installed.</span>\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("<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, 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"));

View file

@ -34,7 +34,6 @@
<child>
<widget class="GtkButton" id="helpbutton1">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-help</property>
<property name="use_stock">True</property>