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

use g_markup_printf_escaped instead of g_strdup_printf, #110564

Browse source 
Tue Feb  3 23:36:25 2004  Jonathan Blandford  <jrb@gnome.org>

        * gnome-theme-manager.c (load_meta_themes): use
        g_markup_printf_escaped instead of g_strdup_printf, #110564
This commit is contained in:
Jonathan Blandford 2004-02-04 04:36:27 +00:00 • committed by Jonathan Blandford
parent 091a9a6b36
commit 1355ee215f
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 3 23:36:25 2004 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-manager.c (load_meta_themes): use
g_markup_printf_escaped instead of g_strdup_printf, #110564
2004-01-14 Jody Goldberg <jody@gnome.org> 2004-01-14 Jody Goldberg <jody@gnome.org>
* Release 2.5.2 * Release 2.5.2

20
capplets/theme-switcher/gnome-theme-manager.c
View file

@ -397,8 +397,8 @@ load_meta_themes (GtkTreeView *tree_view,
else if (compare_val == 0) else if (compare_val == 0)
{ {
/* We reset the blurb in case it has changed */ /* We reset the blurb in case it has changed */
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
list_meta_theme_info->readable_name, list_meta_theme_info->comment); list_meta_theme_info->readable_name, list_meta_theme_info->comment);
pixbuf = default_image; pixbuf = default_image;
gtk_list_store_set (GTK_LIST_STORE (model), &iter, gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@ -418,8 +418,8 @@ load_meta_themes (GtkTreeView *tree_view,
/* we insert a new item */ /* we insert a new item */
GtkTreeIter iter_to_prepend; GtkTreeIter iter_to_prepend;
gtk_list_store_insert_before (GTK_LIST_STORE (model), &iter_to_prepend, &iter); gtk_list_store_insert_before (GTK_LIST_STORE (model), &iter_to_prepend, &iter);
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
list_meta_theme_info->readable_name, list_meta_theme_info->comment); list_meta_theme_info->readable_name, list_meta_theme_info->comment);
pixbuf = default_image; pixbuf = default_image;
gtk_list_store_set (GTK_LIST_STORE (model), &iter_to_prepend, gtk_list_store_set (GTK_LIST_STORE (model), &iter_to_prepend,
@ -440,8 +440,8 @@ load_meta_themes (GtkTreeView *tree_view,
list_meta_theme_info = list->data; list_meta_theme_info = list->data;
gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_append (GTK_LIST_STORE (model), &iter);
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
list_meta_theme_info->readable_name, list_meta_theme_info->comment); list_meta_theme_info->readable_name, list_meta_theme_info->comment);
pixbuf = NULL; pixbuf = NULL;
if (i <= MAX_ELEMENTS_BEFORE_SCROLLING) if (i <= MAX_ELEMENTS_BEFORE_SCROLLING)
pixbuf = generate_theme_thumbnail (list_meta_theme_info, FALSE); pixbuf = generate_theme_thumbnail (list_meta_theme_info, FALSE);
@ -641,8 +641,8 @@ add_custom_row_to_meta_theme (const gchar *current_gtk_theme,
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
/* set the values of the Custom theme. */ /* set the values of the Custom theme. */
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
_("Custom theme"), _("You can save this theme by pressing the Save Theme button.")); _("Custom theme"), _("You can save this theme by pressing the Save Theme button."));
/* Invalidate the cache because the custom theme has potentially changed */ /* Invalidate the cache because the custom theme has potentially changed */
/* Commented out because it does odd things */ /* Commented out because it does odd things */
@ -701,8 +701,8 @@ add_initial_row_to_meta_theme (void)
gtk_list_store_prepend (GTK_LIST_STORE (model), &iter); gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
/* set the values of the Custom theme. */ /* set the values of the Custom theme. */
blurb = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s", blurb = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n%s",
_("Custom theme"), _("You can save this theme by pressing the Save Theme button.")); _("Custom theme"), _("You can save this theme by pressing the Save Theme button."));
/* Invalidate the cache because the custom theme has potentially changed */ /* Invalidate the cache because the custom theme has potentially changed */
/* Commented out because it does odd things */ /* Commented out because it does odd things */