Bug 673397 - Paste Support of Fennec's Qt Port is broken due to Qt Update r=romaxa
authorJeremias Bosch <jeremias.bosch@gmail.com>
Thu, 28 Jul 2011 11:03:33 -0700
changeset 73540 92891e9bb9c5a955edfde456bb36f042dbc49e70
parent 73539 c8a0de7179e0722f24eee8251f16944036971cd4
child 73541 60617a76c65c144d6fb251b152a28941343b5d49
push id20887
push userromaxa@gmail.com
push dateFri, 29 Jul 2011 20:45:30 +0000
treeherdermozilla-central@60617a76c65c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersromaxa
bugs673397
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 673397 - Paste Support of Fennec's Qt Port is broken due to Qt Update r=romaxa
widget/src/qt/nsClipboard.cpp
--- a/widget/src/qt/nsClipboard.cpp
+++ b/widget/src/qt/nsClipboard.cpp
@@ -431,35 +431,32 @@ nsClipboard::HasDataMatchingFlavors(cons
     if (aWhichClipboard != kGlobalClipboard)
         return NS_OK;
 
     // Which kind of data in the clipboard
     QClipboard *cb = QApplication::clipboard();
     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];
         if (flavor)
         {
             QString qflavor(flavor);
 
             if (strcmp(flavor,kTextMime) == 0)
             {
                 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;
                 break;
             }
         }
     }
     return NS_OK;