aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-06-15 05:46:17 +0800
committerChristian Persch <chpe@src.gnome.org>2004-06-15 05:46:17 +0800
commit3454f8d1faec25775a9179fd256524239aa0f620 (patch)
tree72d561313cd658e5b4a176cb9661376f51e6acbe
parentb88d5cc70e93567ffc8aa10f470abe92928b395e (diff)
downloadgsoc2013-epiphany-3454f8d1faec25775a9179fd256524239aa0f620.tar.gz
gsoc2013-epiphany-3454f8d1faec25775a9179fd256524239aa0f620.tar.zst
gsoc2013-epiphany-3454f8d1faec25775a9179fd256524239aa0f620.zip
Use g_markup_print_escaed().
2004-06-14 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-new-bookmark.c: (duplicate_dialog_construct): Use g_markup_print_escaed().
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-new-bookmark.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 780ae963c..47cd86876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2004-06-14 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-new-bookmark.c: (duplicate_dialog_construct):
+
+ Use g_markup_print_escaed().
+
+2004-06-14 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-new-bookmark.c: (duplicate_dialog_construct):
* src/bookmarks/ephy-topic-action.c: (build_topics_menu):
Escape strings before using them with markup in labels.
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 35c8b4d16..e90bae9f5 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -297,7 +297,7 @@ duplicate_dialog_construct (GtkWindow *parent,
{
GtkWidget *dialog;
GtkWidget *hbox, *vbox, *label, *image;
- char *escaped_title, *str, *tmp_str, *tmp_title;
+ char *str, *tmp_str, *tmp_title;
/* FIXME: We "should" use gtk_message dialog here
* but it doesn't support markup of text yet
@@ -333,13 +333,11 @@ duplicate_dialog_construct (GtkWindow *parent,
label = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- escaped_title = g_markup_escape_text (title, -1);
- tmp_title = g_strconcat ("<b>", escaped_title, "</b>", NULL);
+ tmp_title = g_markup_printf_escaped ("<b>%s</b>", title);
tmp_str = g_strdup_printf (_("A bookmark titled %s already exists for this page."),
tmp_title);
str = g_strconcat ("<big>", tmp_str, "</big>", NULL);
gtk_label_set_markup (GTK_LABEL (label), str);
- g_free (escaped_title);
g_free (tmp_title);
g_free (tmp_str);
g_free (str);