Merge lp:~azzar1/unity/fix-772445 into lp:unity

[Andrea Azzarone]

Fix freezes during dnd.

== Problem ==
Dragging image from firefox/chrome to dock causes lagg/freeze

== Fix ==
Replace g_file_info_get_content_type with g_content_type_guess.
It's less accurate but it should not be a problem: we just use it to highlight launcher icons during dnd.

== Test ==
Manual test added.

[Gord Allott (gordallott)]

after consulting my glib knowledge fountains it seems g_content_type_guess should be just fine for our usage.

review: Approve

=== modified file 'launcher/DndData.cpp'
--- launcher/DndData.cpp	2012-05-07 19:52:54 +0000
+++ launcher/DndData.cpp	2012-07-09 17:36:26 +0000
@@ -33,21 +33,22 @@
   Reset();
   
   char* pch = strtok (uris, "\r\n");
-  while (pch != NULL)
+  while (pch)
   {
-    glib::Object<GFile> file(g_file_new_for_uri(pch));
-    glib::Object<GFileInfo> info(g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL));
-    const char* content_type = g_file_info_get_content_type(info);
-    
-    uris_.insert(pch);
-    
-    if (content_type != NULL)
+    glib::String content_type(g_content_type_guess(pch,
+                                                   nullptr,
+                                                   0,
+                                                   nullptr));
+
+    if (content_type)
     {
-      types_.insert(content_type);
-      uris_to_types_[pch] = content_type;
-      types_to_uris_[content_type].insert(pch);
+      types_.insert(content_type.Str());
+      uris_to_types_[pch] = content_type.Str();
+      types_to_uris_[content_type.Str()].insert(pch);
     }
-       
+
+    uris_.insert(pch);
+
     pch = strtok (NULL, "\r\n");
   }
 }

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-06-21 06:55:53 +0000
+++ launcher/Launcher.cpp	2012-07-09 17:36:26 +0000
@@ -2697,7 +2697,7 @@
     {
       for (auto it : *_model)
       {
-        if (it->QueryAcceptDrop(_dnd_data) != nux::DNDACTION_NONE)
+        if (it->ShouldHighlightOnDrag(_dnd_data))
           it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_PRELIGHT, true);
         else
           it->SetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM, true);

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-07-06 07:38:40 +0000
+++ manual-tests/Launcher.txt	2012-07-09 17:36:26 +0000
@@ -592,3 +592,17 @@
 
 Expected Results:
  * The device launcher icon has been removed.
+
+
+Drag and Drop doesn't freeze Unity
+----------------------------------
+Actions:
+#. Open Firefox
+#. Go to http://launchpad.net/unity
+#. Drag around the Unity icon image shown in the top-left corner
+   of the browser window.
+#. Drop it wherever you want.
+
+Expected Result:
+Unity must not freeze during the drag and drop.
+