diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/EphyWrapper.cpp | 18 |
2 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2003-10-18 Marco Pesenti Gritti <marco@gnome.org> + + * embed/mozilla/EphyWrapper.cpp: + + Fix string for old mozilla versions. + 2003-10-18 Christian Persch <chpe@cvs.gnome.org> 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); |