From 29c984ef59c362ced1dcfa66ad6afc2ed42a2637 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 17 Oct 2003 22:57:27 +0000 Subject: Fix string for old mozilla versions. 2003-10-18 Marco Pesenti Gritti * embed/mozilla/EphyWrapper.cpp: Fix string for old mozilla versions. --- ChangeLog | 6 ++++++ embed/mozilla/EphyWrapper.cpp | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea08fce39..902987155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-18 Marco Pesenti Gritti + + * embed/mozilla/EphyWrapper.cpp: + + Fix string for old mozilla versions. + 2003-10-18 Christian Persch Encoding menu improvements, Part 4: 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); -- cgit v1.2.3