diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-06-18 01:58:57 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-06-18 01:58:57 +0800 |
| commit | 16f879b6f60349da03809693ddfa618afd36a093 (patch) | |
| tree | 8f33947db57092300143ad4db5fc66be7da07021 | |
| parent | 0b3bca5b0ba3b55a3eb7f60c5405932dccd406c9 (diff) | |
| download | gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar.gz gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar.bz2 gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar.lz gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar.xz gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.tar.zst gsoc2013-epiphany-16f879b6f60349da03809693ddfa618afd36a093.zip | |
Escape strings before using the with markup in labels. Patch by Crispin
2004-06-17 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
Escape strings before using the with markup in labels.
Patch by Crispin Flowerday.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSClientAuthDialogs.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 14 |
3 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,11 @@ +2004-06-17 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/GtkNSSClientAuthDialogs.cpp: + * embed/mozilla/GtkNSSDialogs.cpp: + + Escape strings before using the with markup in labels. + Patch by Crispin Flowerday. + 2004-06-15 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyBrowser.cpp: diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index 7fb174e7a..23e91374b 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -220,8 +220,8 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, const nsACString &utf8_cn = NS_ConvertUCS2toUTF8(cn); - tt_cn = g_strdup_printf ("\"<tt>%s</tt>\"", - PromiseFlatCString(utf8_cn).get()); + tt_cn = g_markup_printf_escaped ("\"<tt>%s</tt>\"", + PromiseFlatCString(utf8_cn).get()); msg = g_strdup_printf (_("Choose a certificate to present as identification to %s."), tt_cn); diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index d25f0d883..783a0546d 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -287,10 +287,10 @@ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx, cert->GetCommonName (commonName); - ttTargetUrl = g_strdup_printf ("\"<tt>%s</tt>\"", + ttTargetUrl = g_markup_printf_escaped ("\"<tt>%s</tt>\"", PromiseFlatCString(targetURL).get()); - ttCommonName = g_strdup_printf ("\"<tt>%s</tt>\"", + ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", NS_ConvertUCS2toUTF8(commonName).get()); first = g_strdup_printf (_("The site %s returned security information for " @@ -332,7 +332,7 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx, cert->GetCommonName (commonName); - ttCommonName = g_strdup_printf ("\"<tt>%s</tt>\"", + ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", NS_ConvertUCS2toUTF8(commonName).get()); secondary = g_strdup_printf @@ -436,7 +436,7 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx, localtime_r (&t, &tm)); fdate = g_locale_to_utf8 (formattedDate, -1, NULL, NULL, NULL); - ttCommonName = g_strdup_printf ("\"<tt>%s</tt>\"", + ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", NS_ConvertUCS2toUTF8(commonName).get()); secondary = g_strdup_printf (text, ttCommonName, fdate); @@ -482,10 +482,10 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx, cert->GetCommonName (commonName); - ttCommonName = g_strdup_printf ("\"<tt>%s</tt>\"", + ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", NS_ConvertUCS2toUTF8(commonName).get()); - ttTargetUrl = g_strdup_printf ("\"<tt>%s</tt>\"", + ttTargetUrl = g_markup_printf_escaped ("\"<tt>%s</tt>\"", PromiseFlatCString(targetURL).get()); primary = g_strdup_printf (_("Cannot establish connection to %s."), @@ -544,7 +544,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, nsAutoString commonName; cert->GetCommonName (commonName); - ttCommonName = g_strdup_printf ("\"<tt>%s</tt>\"", + ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", NS_ConvertUCS2toUTF8(commonName).get()); tertiary = g_strdup_printf (_("Trust %s to identify:"), ttCommonName ); |