Merge lp:~fboucault/unity-2d/icons_from_unity_theme into lp:unity-2d/3.0

[Florian Boucault]

[launcher] Load trash and workspace-switcher icons from unity-icon-theme.

[Florian Boucault (fboucault)]

The new icons have been uploaded to unity-icon-theme as per bug #745647
Unity was modified to load the workspace switcher and the trash icons from unity-icon-theme as per bug #750471, we need to do the same in Unity 2D.

[Ugo Riboni (uriboni)]

Works

review: Approve

=== modified file 'launcher/UnityApplications/trash.cpp'
--- launcher/UnityApplications/trash.cpp	2011-03-31 08:12:28 +0000
+++ launcher/UnityApplications/trash.cpp	2011-04-15 09:37:12 +0000
@@ -77,7 +77,7 @@
 QString
 Trash::icon() const
 {
-    return "user-trash";
+    return "unity-icon-theme/user-trash";
 }
 
 bool

=== modified file 'launcher/UnityApplications/workspaces.cpp'
--- launcher/UnityApplications/workspaces.cpp	2011-03-21 13:46:48 +0000
+++ launcher/UnityApplications/workspaces.cpp	2011-04-15 09:37:12 +0000
@@ -73,7 +73,7 @@
 QString
 Workspaces::icon() const
 {
-    return QString("workspace-switcher");
+    return QString("unity-icon-theme/workspace-switcher");
 }
 
 bool