261218 - gtkmozembed assumes uri are latin1-encoded

Status: RESOLVED FIXED

(Core Graveyard :: Embedding: GTK Widget, defect)

Description

[Christian :Biesinger (don't email me, ping me on IRC)]

whereas they are in UTF-8.

Comment 1

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch

Comment 2

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 159858 [details] [diff] [review]
patch

hmm, while I'm here, I can get rid of the other AssignWithConversion too

Comment 3

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: patch v2

Comment 4

[Christopher Blizzard (:blizzard)]

Comment on attachment 159861 [details] [diff] [review]
patch v2

Actually, with gtk 1.2 the uris are in local encoding, which isn't always
utf-8.	So you need to special case this or port it for gtk 1.2, too.

Comment 5

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 159861 [details] [diff] [review]
patch v2

blizzard: that's why I'm using CopyNativeToUnicode in gtk1's SetURI. (I
verified that this works)

the uris gotten off nsIURI are in UTF-8 even in gtk1 (the EmbedProgress change)

Comment 6

[Christopher Blizzard (:blizzard)]

Hang on.  What does CopyNativeToUnicode do in the case where the native encoding
is not UTF-8 and we happen to be using gtk2?  In that case, we should still be
using UTF-8 for the string because all strings internal to gtk2 are UTF-8.  I'll
bet that will still copy using the encoding specified in LANG (without looking
at the code, of course.)

Comment 7

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 159861 [details] [diff] [review]
patch v2

yes, in such a case it would use $LANG, but that's ok because
CopyNativeToUnicode in this patch is inside a gtk1 ifdef.

gtk2 correctly uses CopyUTF8toUTF16

Comment 8

[Christopher Blizzard (:blizzard)]

Comment on attachment 159861 [details] [diff] [review]
patch v2

Sold.

Comment 9

[Christian :Biesinger (don't email me, ping me on IRC)]

thanks, checked in

Checking in embedding/browser/gtk/src/EmbedPrivate.cpp;
/cvsroot/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp,v  <--  EmbedPrivate.cpp
new revision: 1.47; previous revision: 1.46
done
Checking in embedding/browser/gtk/src/EmbedProgress.cpp;
/cvsroot/mozilla/embedding/browser/gtk/src/EmbedProgress.cpp,v  <-- 
EmbedProgress.cpp
new revision: 1.15; previous revision: 1.14
done