Merge lp:~robertcarr/unity/homelauncher-dnd into lp:unity

[Robert Carr]

Let the home launcher accept all drag types.

[Andrea Azzarone (azzar1)]

Please use is_home_launcher instead of IsHomeLauncher.

[Robert Carr (robertcarr)]

Whooooops :) fixed

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-08 11:04:17 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-09-12 15:01:26 +0000
@@ -1064,10 +1064,12 @@
 std::set<std::string> BamfLauncherIcon::ValidateUrisForLaunch(unity::DndData& uris)
 {
   std::set<std::string> result;
-  
+  gboolean is_home_launcher = g_str_has_suffix(DesktopFile(), "nautilus-home.desktop");
+
   for (auto i : uris.Types())
     for (auto j : GetSupportedTypes())
-      if (g_content_type_is_a(i.c_str(), j.c_str()))
+      if (g_content_type_is_a(i.c_str(), j.c_str()) || 
+          is_home_launcher)
       {
         for (auto k : uris.UrisByType(i))
           result.insert(k);