diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-06-22 20:37:00 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-06-22 20:37:00 +0800 |
| commit | 7444dff3902968066f45081c342fa8ebb8aaf1d0 (patch) | |
| tree | f2dffcfdad23a35b0aa66322501fe737ed22e58d /embed/mozilla/GtkNSSClientAuthDialogs.cpp | |
| parent | c7c27d1728fd00d3ebfa49e4f0c8c75c5176e6b0 (diff) | |
| download | gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar.gz gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar.bz2 gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar.lz gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar.xz gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.tar.zst gsoc2013-epiphany-7444dff3902968066f45081c342fa8ebb8aaf1d0.zip | |
A lib/ephy-password-dialog.c: A lib/ephy-password-dialog.h:
2006-06-22 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.h:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/MozRegisterComponents.cpp:
* lib/Makefile.am:
A lib/ephy-password-dialog.c:
A lib/ephy-password-dialog.h:
Implement nsITokenPasswordDialogs. Misc cleanups and mozilla string
simplification now that we depend on gecko 1.8.
Diffstat (limited to 'embed/mozilla/GtkNSSClientAuthDialogs.cpp')
| -rw-r--r-- | embed/mozilla/GtkNSSClientAuthDialogs.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index 26ed934d9..d6765c15e 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -197,14 +197,9 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - - - nsCString utf8_cn; - NS_UTF16ToCString (nsString (cn), - NS_CSTRING_ENCODING_UTF8, utf8_cn); msg = g_markup_printf_escaped (_("Choose a certificate to present as identification to “%s”."), - utf8_cn.get()); + NS_ConvertUTF16toUTF8 (cn).get()); markup_text = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", _("Select a certificate to identify yourself."), msg); @@ -216,18 +211,10 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); for (i = 0; i < count; i++) { - nsCString certnick; - nsCString certdetail; - - NS_UTF16ToCString (nsString (certNickList[i]), - NS_CSTRING_ENCODING_UTF8, certnick); - NS_UTF16ToCString (nsString (certDetailsList[i]), - NS_CSTRING_ENCODING_UTF8, certdetail); - gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, - 0, certnick.get(), - 1, certdetail.get(), + 0, NS_ConvertUTF16toUTF8 (certNickList[i]).get(), + 1, NS_ConvertUTF16toUTF8 (certDetailsList[i]).get(), -1); } |