aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-10-18 06:57:27 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-10-18 06:57:27 +0800
commit29c984ef59c362ced1dcfa66ad6afc2ed42a2637 (patch)
tree53a19094b8e6995fa2edbda5282d6bf7c5b504f7 /embed/mozilla
parent0e078cd9825b89e128d0501d4a7b5885670c2347 (diff)
downloadgsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar.gz
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar.bz2
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar.lz
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar.xz
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.tar.zst
gsoc2013-epiphany-29c984ef59c362ced1dcfa66ad6afc2ed42a2637.zip
Fix string for old mozilla versions.
2003-10-18 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/EphyWrapper.cpp: Fix string for old mozilla versions.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyWrapper.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index 371e87134..605c3183a 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -848,21 +848,23 @@ nsresult EphyWrapper::GetEncodingInfo (EphyEncodingInfo **infoptr)
if (NS_FAILED (result)) return NS_ERROR_FAILURE;
info->prev_doc_encoding = g_strdup (enc.get());
#else
- result = mdv->GetDefaultCharacterSet (enc);
+ PRUnichar *str;
+
+ result = mdv->GetDefaultCharacterSet (&str);
if (NS_FAILED (result)) return NS_ERROR_FAILURE;
- info->default_encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get());
+ info->default_encoding = g_strdup (NS_ConvertUCS2toUTF8(str).get());
- result = mdv->GetForceCharacterSet (enc);
+ result = mdv->GetForceCharacterSet (&str);
if (NS_FAILED (result)) return NS_ERROR_FAILURE;
- info->forced_encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get());
+ info->forced_encoding = g_strdup (NS_ConvertUCS2toUTF8(str).get());
- result = mdv->GetHintCharacterSet (enc);
+ result = mdv->GetHintCharacterSet (&str);
if (NS_FAILED (result)) return NS_ERROR_FAILURE;
- info->hint_encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get());
+ info->hint_encoding = g_strdup (NS_ConvertUCS2toUTF8(str).get());
- result = mdv->GetPrevDocCharacterSet (enc);
+ result = mdv->GetPrevDocCharacterSet (&str);
if (NS_FAILED (result)) return NS_ERROR_FAILURE;
- info->prev_doc__encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get());
+ info->prev_doc_encoding = g_strdup (NS_ConvertUCS2toUTF8(str).get());
#endif
mdv->GetHintCharacterSetSource (&source);