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

fix message markup appearing in dialog (bug #572453)

Browse source 
2009-02-19  Jens Granseuer  <jensgr@gmx.net>

	* theme-installer.c: (gnome_theme_install_real): fix message markup
	appearing in dialog (bug #572453)

svn path=/trunk/; revision=9277
This commit is contained in:
Jens Granseuer 2009-02-19 19:36:54 +00:00 • committed by Jens Granseuer
parent 91457e6f53
commit 805d3406f1
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/appearance/ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-19 Jens Granseuer <jensgr@gmx.net>
* theme-installer.c: (gnome_theme_install_real): fix message markup
appearing in dialog (bug #572453)
==================== 2.25.90 ==================== ==================== 2.25.90 ====================
2009-01-28 Luca Ferretti <elle.uca@libero.it> 2009-01-28 Luca Ferretti <elle.uca@libero.it>

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

@ -270,7 +270,6 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
GFile *theme_source_dir, *theme_dest_dir; GFile *theme_source_dir, *theme_dest_dir;
GError *error = NULL; GError *error = NULL;
gint theme_type; gint theme_type;
gchar *user_message = NULL;
gchar *target_dir = NULL; gchar *target_dir = NULL;
/* What type of theme is it? */ /* What type of theme is it? */
@ -287,8 +286,6 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
target_dir = g_build_path (G_DIR_SEPARATOR_S, target_dir = g_build_path (G_DIR_SEPARATOR_S,
g_get_home_dir (), ".themes", g_get_home_dir (), ".themes",
theme_name, NULL); theme_name, NULL);
user_message = g_strdup_printf (_("GNOME Theme %s correctly installed"),
theme_name);
break; break;
case THEME_METACITY: case THEME_METACITY:
case THEME_GTK: case THEME_GTK:
@ -386,19 +383,18 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
if (ask_user) if (ask_user)
{ {
/* Ask to apply theme (if we can) */ /* Ask to apply theme (if we can) */
if ((theme_type == THEME_GTK || theme_type == THEME_METACITY || if (theme_type == THEME_GTK || theme_type == THEME_METACITY ||
theme_type == THEME_ICON || theme_type == THEME_CURSOR || theme_type == THEME_ICON || theme_type == THEME_CURSOR ||
theme_type == THEME_ICON_CURSOR) && ask_user) theme_type == THEME_ICON_CURSOR)
{ {
/* TODO: currently cannot apply "gnome themes" */ /* TODO: currently cannot apply "gnome themes" */
gchar *str; gchar *str;
str = g_strdup_printf (_("The theme \"%s\" has been installed."), theme_name); str = g_strdup_printf (_("The theme \"%s\" has been installed."), theme_name);
user_message = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>", str); dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE,
"<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, "%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?"));
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Keep Current Theme"), GTK_RESPONSE_CLOSE); gtk_dialog_add_button (GTK_DIALOG (dialog), _("Keep Current Theme"), GTK_RESPONSE_CLOSE);
@ -447,15 +443,14 @@ 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", _("GNOME Theme %s correctly installed"),
user_message); theme_name);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));
} }
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }
} }
g_free (user_message);
g_free (target_dir); g_free (target_dir);
return success; return success;