wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 673397 - Paste Support of Fennec's Qt Port is broken due to Qt Update r=romaxa

Browse Source 
--HG--
extra : rebase_source : a21a795d6992e9d51246b34e98a3ed8a7b99a4a5
This commit is contained in:
Jeremias Bosch 2011-07-28 11:03:33 -07:00
parent fc1cdce7a6
commit 0fa8e205f6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/src/qt/nsClipboard.cpp
View File

@ -436,9 +436,6 @@ nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
const QMimeData *mimeData = cb->mimeData();
const char *flavor=NULL;
QStringList formats = mimeData->formats();
// Temp QString for comparison
QString utf8text("text/plain;charset=utf-8");
// And is there matching flavor?
for (PRUint32 i = 0; i < aLength; ++i)
{
flavor = aFlavorList[i];
@ -451,10 +448,10 @@ nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
NS_WARNING("DO NOT USE THE text/plain DATA FLAVOR ANY MORE. USE text/unicode INSTEAD");
}
// QClipboard says it has text/plain;charset=utf-8 data, mozilla wants to
// know if the data is text/unicode -> interpret text/plain;charset=utf-8 to text/unicode
// QClipboard says it has text/plain, mozilla wants to
// know if the data is text/unicode -> interpret text/plain to text/unicode
if (formats.contains(qflavor) ||
((strcmp(flavor, kUnicodeMime) == 0) && formats.contains(utf8text)))
strcmp(flavor, kUnicodeMime) == 0)
{
// A match has been found, return'
*_retval = PR_TRUE;