aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed-persist.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2004-03-17 17:02:38 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-03-17 17:02:38 +0800
commitdbdcf80ba8e559236f9937aaafba1d14b1cee46e (patch)
treed5711b633861b6ffc879fbbce08ea1364e9a64c9 /embed/mozilla/mozilla-embed-persist.cpp
parent9765279aba4cbed66b182e91eaa18e8225305a18 (diff)
downloadgsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.gz
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.bz2
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.lz
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.xz
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.tar.zst
gsoc2013-epiphany-dbdcf80ba8e559236f9937aaafba1d14b1cee46e.zip
merging pre-gnome-2-8 branch
Diffstat (limited to 'embed/mozilla/mozilla-embed-persist.cpp')
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index b3620b3fc..a69c55aad 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -311,10 +311,9 @@ impl_to_string (EphyEmbedPersist *persist)
nsAutoString aOutputString;
encoder->EncodeToString(aOutputString);
- return g_strdup (NS_ConvertUCS2toUTF8(aOutputString).get());
+ return g_strdup (NS_ConvertUTF16toUTF8(aOutputString).get());
}
-
static GObject *
mozilla_embed_persist_constructor (GType type, guint n_construct_properties,
GObjectConstructParam *construct_params)