Merge lp:~unity-team/unity/trunk-cherrypicks-for-6.0 into lp:unity/6.0

[Michal Hruby]

Cherrypicks from unity's trunk for 6.8.0

Distro-approved cherrypicks from lp:unity to go into the 6.8.0 release.

[Didier Roche-Tolomelli (didrocks)]

I trust Michal that it's the full branches we discussed about :)
It seems to be those from the revisions.

review: Approve

[Brandon Schaefer (brandontschaefer)]

Looks good.

review: Approve

[Daniel van Vugt (vanvugt)]

Cool, but what are the bug numbers being fixed here?

[Daniel van Vugt (vanvugt)]

OK I've linked the bugs to this branch, best I can tell.

Please link or document the bugs being fixed next time.

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-20 10:18:18 +0000
+++ dash/DashView.cpp	2012-09-28 21:43:21 +0000
@@ -37,8 +37,6 @@
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/PreviewStyle.h"
 
-#include "Nux/NuxTimerTickSource.h"
-
 namespace unity
 {
 namespace dash
@@ -96,9 +94,6 @@
   , opening_row_y_(-1)
   , opening_row_height_(0)
 {
-  //tick_source_.reset(new nux::NuxTimerTickSource);
-  //animation_controller_.reset(new na::AnimationController(*tick_source_));
-
   renderer_.SetOwner(this);
   renderer_.need_redraw.connect([this] () {
     QueueDraw();

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2012-09-19 13:58:01 +0000
+++ dash/DashView.h	2012-09-28 21:43:21 +0000
@@ -23,7 +23,6 @@
 #include <Nux/PaintLayer.h>
 #include <Nux/View.h>
 #include <Nux/VLayout.h>
-#include <Nux/NuxTimerTickSource.h>
 
 #include <UnityCore/FilesystemLenses.h>
 #include <UnityCore/HomeLens.h>
@@ -165,8 +164,6 @@
 
   float fade_out_value_;
   float fade_in_value_;
-  std::unique_ptr<nux::NuxTimerTickSource> tick_source_;
-  std::unique_ptr<na::AnimationController> animation_controller_;
   na::AnimateValue<float> animation_;
 
   void FadeOutCallBack(float const& fade_out_value);

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-09-18 13:59:06 +0000
+++ dash/ResultViewGrid.cpp	2012-09-28 21:43:21 +0000
@@ -26,6 +26,7 @@
 #include <NuxGraphics/GdkGraphics.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <unity-protocol.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/Timer.h"
@@ -844,8 +845,19 @@
 
   if (G_IS_ICON(icon))
   {
-     info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0);
-      g_object_unref(icon);
+     if (UNITY_PROTOCOL_IS_ANNOTATED_ICON(icon))
+     {
+        UnityProtocolAnnotatedIcon *anno;
+        anno = UNITY_PROTOCOL_ANNOTATED_ICON(icon);
+
+        GIcon *base_icon = unity_protocol_annotated_icon_get_icon(anno);
+        info = gtk_icon_theme_lookup_by_gicon(theme, base_icon, size, (GtkIconLookupFlags)0);
+     }
+     else
+     {
+       info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0);
+     }
+     g_object_unref(icon);
   }
   else
   {

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2012-09-19 17:21:06 +0000
+++ dash/previews/ActionButton.cpp	2012-09-28 21:43:21 +0000
@@ -77,11 +77,6 @@
 {
   InitTheme();
 
-  key_nav_focus_change.connect([&] (nux::Area*, bool, nux::KeyNavDirection)
-  {
-    QueueDraw();
-  });
-
   key_nav_focus_activate.connect([&](nux::Area*)
   {
     if (GetInputEventSensitivity())

=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
--- dash/previews/PreviewInfoHintWidget.cpp	2012-08-30 16:02:55 +0000
+++ dash/previews/PreviewInfoHintWidget.cpp	2012-09-28 21:43:21 +0000
@@ -221,7 +221,6 @@
     }
     if (info_hint.second)
     {
-      info_hint.second->SetMinimumWidth(info_value_width);
       info_hint.second->SetMaximumWidth(info_value_width);
     }
   }

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-09-28 11:32:04 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-09-28 21:43:21 +0000
@@ -630,35 +630,38 @@
   std::vector<Window> windows;
   GList* children;
 
-  BamfView *focusable_child = BAMF_VIEW (bamf_application_get_focusable_child (_bamf_app.RawPtr()));
+  BamfView *focusable_child = BAMF_VIEW(bamf_application_get_focusable_child(_bamf_app.RawPtr()));
 
   if (focusable_child != NULL)
-    {
-      Window xid;
-
-      if (BAMF_IS_WINDOW (focusable_child))
-        xid = bamf_window_get_xid (BAMF_WINDOW(focusable_child));
-      else if (BAMF_IS_TAB (focusable_child))
-        {
-          BamfTab *focusable_tab = BAMF_TAB (focusable_child);
-
-          xid = bamf_tab_get_xid (focusable_tab);
-
-          bamf_tab_raise (focusable_tab);
-        }
-
+  {
+    Window xid = 0;
+
+    if (BAMF_IS_WINDOW(focusable_child))
+    {
+      xid = bamf_window_get_xid(BAMF_WINDOW(focusable_child));
+    }
+    else if (BAMF_IS_TAB(focusable_child))
+    {
+      BamfTab *focusable_tab = BAMF_TAB(focusable_child);
+      xid = bamf_tab_get_xid(focusable_tab);
+      bamf_tab_raise(focusable_tab);
+    }
+
+    if (xid)
+    {
       windows.push_back(xid);
       return windows;
     }
+  }
   else
+  {
+    if (g_strcmp0(bamf_application_get_application_type(_bamf_app.RawPtr()), "webapp") == 0)
     {
-      if (g_strcmp0 (bamf_application_get_application_type (_bamf_app.RawPtr()), "webapp") == 0)
-        {
-          OpenInstanceLauncherIcon(arg);
+      OpenInstanceLauncherIcon(arg);
 
-          return windows;
-        }
+      return windows;
     }
+  }
 
   children = bamf_view_get_children(BAMF_VIEW(_bamf_app.RawPtr()));
 
@@ -704,7 +707,7 @@
   }
 
   g_list_free(children);
-  
+
   return windows;
 
 }

=== modified file 'launcher/FavoriteStoreGSettings.cpp'
--- launcher/FavoriteStoreGSettings.cpp	2012-09-14 10:27:12 +0000
+++ launcher/FavoriteStoreGSettings.cpp	2012-09-28 21:43:21 +0000
@@ -65,11 +65,11 @@
 void FavoriteStoreGSettings::FillList()
 {
   favorites_.clear();
-  std::shared_ptr<gchar*> favs(g_settings_get_strv(settings_, SETTINGS_KEY.c_str()));
+  std::unique_ptr<gchar*[], void(*)(gchar**)> favs(g_settings_get_strv(settings_, SETTINGS_KEY.c_str()), g_strfreev);
 
-  for (int i = 0; favs.get()[i]; ++i)
+  for (int i = 0; favs[i]; ++i)
   {
-    std::string const& fav = ParseFavoriteFromUri(favs.get()[i]);
+    std::string const& fav = ParseFavoriteFromUri(favs[i]);
 
     if (!fav.empty())
       favorites_.push_back(fav);

=== modified file 'launcher/StandaloneSwitcher.cpp'
--- launcher/StandaloneSwitcher.cpp	2012-08-13 20:16:28 +0000
+++ launcher/StandaloneSwitcher.cpp	2012-09-28 21:43:21 +0000
@@ -104,7 +104,7 @@
   for (int i = 0; i < self->GetValue (); i++)
     icons.push_back(nux::ObjectPtr<AbstractLauncherIcon>(new MockLauncherIcon()));
 
-  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, false, icons);
+  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, icons);
 }
 
 void OnNextClicked (nux::View *sender)
@@ -138,7 +138,7 @@
   for (int i = 0; i < 9; i++)
     icons.push_back(nux::ObjectPtr<AbstractLauncherIcon>(new MockLauncherIcon()));
 
-  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, false, icons);
+  view->Show(ShowMode::ALL, SortMode::FOCUS_ORDER, icons);
 
   view->GetView ()->render_boxes = true;
 

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-09-13 10:56:42 +0000
+++ launcher/SwitcherController.cpp	2012-09-28 21:43:21 +0000
@@ -77,8 +77,7 @@
   return (!empty && !WindowManager::Default()->IsWallActive());
 }
 
-void Controller::Show(ShowMode show, SortMode sort, bool reverse,
-                      std::vector<AbstractLauncherIcon::Ptr> results)
+void Controller::Show(ShowMode show, SortMode sort, std::vector<AbstractLauncherIcon::Ptr> results)
 {
   if (results.empty())
     return;

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-08-20 14:59:10 +0000
+++ launcher/SwitcherController.h	2012-09-28 21:43:21 +0000
@@ -67,7 +67,7 @@
   nux::Property<int>  detail_timeout_length;
   nux::Property<int> initial_detail_timeout_length;
 
-  void Show(ShowMode show, SortMode sort, bool reverse, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
+  void Show(ShowMode show, SortMode sort, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
   void Hide(bool accept_state=true);
 
   bool CanShowSwitcher(const std::vector<launcher::AbstractLauncherIcon::Ptr>& resutls) const;

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2012-08-28 17:39:44 +0000
+++ launcher/VolumeImp.cpp	2012-09-28 21:43:21 +0000
@@ -89,7 +89,10 @@
 
   std::string GetIdentifier() const
   {
-    return glib::String(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UUID)).Str();
+    glib::String label(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_LABEL));
+    glib::String uuid(g_volume_get_identifier(volume_, G_VOLUME_IDENTIFIER_KIND_UUID));
+
+    return uuid.Str() + "-" + label.Str();
   }
 
   bool HasSiblings() const

=== modified file 'manual-tests/Switcher.txt'
--- manual-tests/Switcher.txt	2012-09-26 18:06:13 +0000
+++ manual-tests/Switcher.txt	2012-09-28 21:43:21 +0000
@@ -104,6 +104,7 @@
 Expected Result:
   The assertions from above hold.
 
+
 Alt+Tab doesn't lose window focus
 ---------------------------------
 This tests ensures that a racing condition is not possible anymore when alt+tabing.

=== modified file 'plugins/unityshell/resources/emblem_apps.svg'
--- plugins/unityshell/resources/emblem_apps.svg	2012-09-05 18:32:32 +0000
+++ plugins/unityshell/resources/emblem_apps.svg	2012-09-28 21:43:21 +0000
@@ -1,19 +1,90 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
-<path fill="#DC4A26" d="M8.5,4.504v7.997c0,0.55-0.469,0.999-1.018,0.999H6.498c-0.55,0-0.998-0.449-0.998-0.999V4.504H8.5z"/>
-<g>
-	<path fill="#DC4A26" d="M4.5,4.504h-2v-1h2V1.505c0-0.55-0.45-1-1-1H1.501c-0.55,0-1,0.45-1,1L0.5,12.501
-		c0,0.55,0.45,0.999,1,0.999h1.999c0.55,0,1-0.449,1-0.999V10.5L2.5,10.502v-1L4.499,9.5V7.503H2.5v-1h2"/>
-</g>
-<path fill="#DC4A26" d="M4.5,6.503v-1l0,0V6.503L4.5,6.503z"/>
-<path fill="#DC4A26" d="M4.5,9.502v-1h0L4.5,9.502L4.5,9.502z"/>
-<path fill="#DC4A26" d="M4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499z"/>
-<path fill="#DC4A26" d="M11.866,0.508v1.237C12.102,1.856,12.3,2.052,12.3,2.286c0,0.354-0.358,0.64-0.8,0.64s-0.8-0.286-0.8-0.64
-	c0-0.234,0.198-0.43,0.433-0.541V0.508C10.66,0.972,9.5,2.321,9.5,2.917c0,0.884,1.116,1.6,2,1.6s2-0.716,2-1.6
-	C13.5,2.321,12.34,0.972,11.866,0.508z"/>
-<path fill="#DC4A26" d="M5.501,3.499L7.047,0.5L8.5,3.499H5.501z"/>
-<path fill="#DC4A26" d="M13.5,5.503v6.998c0,0.55-0.45,0.999-1,0.999h-2c-0.55,0-1-0.449-1-0.999V5.503H13.5z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="14px"
+   height="14px"
+   viewBox="0 0 14 14"
+   enable-background="new 0 0 14 14"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="emblem_apps.svg"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs23" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="879"
+   inkscape:window-height="476"
+   id="namedview21"
+   showgrid="false"
+   inkscape:zoom="16.857143"
+   inkscape:cx="7.0207628"
+   inkscape:cy="7.0000001"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+<path
+   d="m 9,5 v 8.000556 C 9,13.5508 8.531,14 7.982,14 H 6.998 C 6.448,14 6,13.5508 6,13.000556 V 5 h 3 z"
+   id="path3"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<g
+   id="g5"
+   transform="matrix(1,0,0,1.0003848,0.5,0.49480569)">
+	<path
+   d="m 4.5,4.504 h -2 v -1 h 2 V 1.505 c 0,-0.55 -0.45,-1 -1,-1 H 1.501 c -0.55,0 -1,0.45 -1,1 L 0.5,12.501 c 0,0.55 0.45,0.999 1,0.999 h 1.999 c 0.55,0 1,-0.449 1,-0.999 V 10.5 L 2.5,10.502 v -1 L 4.499,9.5 V 7.503 H 2.5 v -1 h 2"
+   id="path7"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+</g>
+<path
+   d="m 5,7.003 v -1 l 0,0 v 1 l 0,0 z"
+   id="path9"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<path
+   d="m 5,10.002 v -1 h 0 l 0,1 0,0 z"
+   id="path11"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<path
+   d="m 5,12.999 0,0 0,0 0,0 0,0 z"
+   id="path13"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<path
+   d="m 12.366,1 v 1.234223 c 0.236,0.1107508 0.434,0.3063108 0.434,0.5397855 0,0.3532053 -0.358,0.6385632 -0.8,0.6385632 -0.442,0 -0.8,-0.2853579 -0.8,-0.6385632 0,-0.2334747 0.198,-0.4290347 0.433,-0.5397855 V 1 C 11.16,1.4629583 10,2.8089299 10,3.4035919 10,4.2856074 11.116,5 12,5 12.884,5 14,4.2856074 14,3.4035919 14,2.8089299 12.84,1.4629583 12.366,1 z"
+   id="path15"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<path
+   d="M 6,4 7.5465155,1 9,4 H 6 z"
+   id="path17"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+<path
+   d="m 14,6 v 7.000625 C 14,13.550832 13.55,14 13,14 h -2 c -0.55,0 -1,-0.449168 -1,-0.999375 V 6 h 4 z"
+   id="path19"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+</svg>
\ No newline at end of file

=== added file 'plugins/unityshell/resources/emblem_others.svg'
--- plugins/unityshell/resources/emblem_others.svg	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/resources/emblem_others.svg	2012-09-28 21:43:21 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<g>
+	<path fill="#DC4A26" d="M1.667,5C1.298,5,1,5.298,1,5.667v6.667C1,12.702,1.298,13,1.667,13h10.667C12.702,13,13,12.702,13,12.334
+		V5.667C13,5.298,12.702,5,12.334,5H10.5C10.097,3.775,8.947,1,7,1C5.054,1,3.902,3.775,3.5,5H1.667z M4.5,5C4.923,3.757,5.84,2,7,2
+		s2.076,1.757,2.5,3H4.5z M4.001,8C3.446,8,3,7.555,3,7c0-0.551,0.446-1,1.001-1C4.554,6,5,6.449,5,7C5,7.555,4.554,8,4.001,8z
+		 M10,8.001C9.447,8.001,9,7.554,9,7c0-0.553,0.447-1.001,1-1.001S11,6.447,11,7C11,7.554,10.553,8.001,10,8.001z"/>
+</g>
+</svg>

=== modified file 'plugins/unityshell/resources/emblem_video.svg'
--- plugins/unityshell/resources/emblem_video.svg	2012-09-05 18:32:32 +0000
+++ plugins/unityshell/resources/emblem_video.svg	2012-09-28 21:43:21 +0000
@@ -1,17 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#DC4A26" d="M12.301,2.5H1.7C1.315,2.5,1,2.813,1,3.196v7.608C1,11.188,1.315,11.5,1.7,11.5h10.601
-			c0.385,0,0.699-0.312,0.699-0.696V3.196C13,2.813,12.686,2.5,12.301,2.5z M2.989,10.455H1.994V9.498h0.996V10.455z M2.989,8.49
-			H1.994V7.5h0.996V8.49z M2.989,6.494H1.994V5.535h0.996V6.494z M2.989,4.496H1.994V3.538h0.996V4.496z M8.006,7.841
-			C7.659,8.126,7.308,8.404,6.954,8.677C6.6,8.947,6.255,9.197,5.92,9.426c-0.335,0.229-0.64,0.422-0.913,0.579V4.026
-			c0.261,0.158,0.559,0.35,0.894,0.578c0.335,0.229,0.68,0.476,1.034,0.74c0.354,0.265,0.708,0.54,1.061,0.825
-			c0.355,0.286,0.687,0.565,0.998,0.836C8.684,7.276,8.354,7.555,8.006,7.841z M11.992,10.455h-0.996V9.498h0.996V10.455z
-			 M11.992,8.49h-0.996V7.5h0.996V8.49z M11.992,6.494h-0.996V5.535h0.996V6.494z M11.992,4.496h-0.996V3.538h0.996V4.496z"/>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="14px"
+   height="14px"
+   viewBox="0 0 14 14"
+   enable-background="new 0 0 14 14"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="emblem_video.svg"><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1215"
+   inkscape:window-height="776"
+   id="namedview9"
+   showgrid="false"
+   inkscape:zoom="16.857143"
+   inkscape:cx="7"
+   inkscape:cy="7"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g3"
+   transform="translate(0,0.5)">
+	<g
+   id="g5">
+		<path
+   d="M 12.301,2.5 H 1.7 C 1.315,2.5 1,2.813 1,3.196 v 7.608 C 1,11.188 1.315,11.5 1.7,11.5 H 12.301 C 12.686,11.5 13,11.188 13,10.804 V 3.196 C 13,2.813 12.686,2.5 12.301,2.5 z M 2.989,10.455 H 1.994 V 9.498 H 2.99 v 0.957 z m 0,-1.965 H 1.994 V 7.5 H 2.99 v 0.99 z m 0,-1.996 H 1.994 V 5.535 H 2.99 v 0.959 z m 0,-1.998 H 1.994 V 3.538 H 2.99 V 4.496 z M 8.006,7.841 C 7.659,8.126 7.308,8.404 6.954,8.677 6.6,8.947 6.255,9.197 5.92,9.426 5.585,9.655 5.28,9.848 5.007,10.005 V 4.026 c 0.261,0.158 0.559,0.35 0.894,0.578 0.335,0.229 0.68,0.476 1.034,0.74 0.354,0.265 0.708,0.54 1.061,0.825 0.355,0.286 0.687,0.565 0.998,0.836 -0.31,0.271 -0.64,0.55 -0.988,0.836 z m 3.986,2.614 H 10.996 V 9.498 h 0.996 v 0.957 z m 0,-1.965 H 10.996 V 7.5 h 0.996 v 0.99 z m 0,-1.996 H 10.996 V 5.535 h 0.996 v 0.959 z m 0,-1.998 H 10.996 V 3.538 h 0.996 v 0.958 z"
+   id="path7"
+   inkscape:connector-curvature="0"
+   style="fill:#dc4a26" />
+	</g>
+</g>
+</svg>
\ No newline at end of file

=== modified file 'plugins/unityshell/resources/lens-nav-gwibber.svg'
--- plugins/unityshell/resources/lens-nav-gwibber.svg	2012-09-11 13:12:50 +0000
+++ plugins/unityshell/resources/lens-nav-gwibber.svg	2012-09-28 21:43:21 +0000
@@ -3,12 +3,10 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path fill="#FFFFFF" d="M23,11.38c-0.774,0.14-1.897-0.005-2.492-0.267c1.236-0.108,2.073-0.701,2.396-1.505
-	c-0.445,0.29-1.829,0.604-2.593,0.304c-0.038-0.189-0.078-0.369-0.121-0.533c-0.581-2.256-2.576-4.074-4.663-3.854
-	c0.169-0.073,0.34-0.139,0.512-0.2c0.229-0.087,1.577-0.318,1.365-0.82c-0.179-0.442-1.828,0.332-2.138,0.435
-	c0.41-0.162,1.087-0.441,1.159-0.939c-0.627,0.091-1.243,0.404-1.72,0.86c0.173-0.195,0.304-0.432,0.331-0.689
-	c-1.675,1.129-2.652,3.405-3.443,5.613c-0.621-0.637-1.173-1.136-1.667-1.416C8.541,7.584,6.883,6.766,4.282,5.746
-	c-0.08,0.909,0.426,2.118,1.881,2.92C5.848,8.621,5.271,8.722,4.811,8.838c0.188,1.042,0.801,1.899,2.463,2.312
-	c-0.759,0.053-1.153,0.237-1.508,0.629c0.346,0.725,1.191,1.576,2.708,1.401c-1.689,0.769-0.688,2.19,0.686,1.979
-	C6.817,17.715,3.122,17.525,1,15.39c5.539,7.969,17.581,4.712,19.374-2.963C21.721,12.438,22.51,11.936,23,11.38z"/>
+<path fill="#FFFFFF" d="M12.635,13.608c-0.849,0.836-2.011,1.265-3.272,1.204l0,0c-0.413-0.02-0.826-0.091-1.229-0.215
+	c-0.368-0.112-0.665-0.404-0.778-0.769c-0.509-1.623-0.123-3.323,1.009-4.437c0.85-0.836,2.011-1.264,3.272-1.205
+	c0.411,0.02,0.826,0.093,1.228,0.215c0.368,0.113,0.665,0.405,0.778,0.769C14.153,10.794,13.766,12.492,12.635,13.608z M15.5,7
+	C15.224,7,15,6.775,15,6.499C15,6.224,15.224,6,15.5,6S16,6.224,16,6.499C16,6.775,15.776,7,15.5,7z M19.986,5.999 M20,6
+	c0.552,0,1-0.447,1-1c0-0.552-0.449-1-1-1h-9c-4.418,0-8,3.582-8,8c0,4.418,3.582,8,8,8c4.417,0,8-3.576,8-7.994V7
+	c0-0.01,0.001-0.019,0.001-0.028C19.001,6.436,19.448,6,20,6"/>
 </svg>

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-28 10:41:06 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-28 21:43:21 +0000
@@ -24,7 +24,6 @@
 #include <Nux/HLayout.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/WindowCompositor.h>
-#include <Nux/NuxTimerTickSource.h>
 
 #include <UnityCore/Variant.h>
 
@@ -131,6 +130,7 @@
   , panel_texture_has_changed_(true)
   , paint_panel_(false)
   , scale_just_activated_(false)
+  , big_tick_(0)
   , screen_introspection_(screen)
 {
   Timer timer;
@@ -234,7 +234,7 @@
                                            this));
 #endif
 
-    tick_source_.reset(new nux::NuxTimerTickSource);
+    tick_source_.reset(new na::TickSource);
     animation_controller_.reset(new na::AnimationController(*tick_source_));
 
      wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::onRedrawRequested));
@@ -1283,6 +1283,9 @@
 {
   cScreen->preparePaint(ms);
 
+  big_tick_ += ms*1000;
+  tick_source_->tick(big_tick_);
+
   for (ShowdesktopHandlerWindowInterface *wi : ShowdesktopHandler::animating_windows)
     wi->HandleAnimations (ms);
 
@@ -1304,6 +1307,9 @@
   if (didShellRepaint)
     wt->ClearDrawList();
 
+  if (animation_controller_->HasRunningAnimations())
+    nuxDamageCompiz();
+
   std::list <ShowdesktopHandlerWindowInterface *> remove_windows;
 
   for (ShowdesktopHandlerWindowInterface *wi : ShowdesktopHandler::animating_windows)
@@ -1425,7 +1431,7 @@
    *       stop it. Then maybe we can revert back to the old code below #else.
    */
   std::vector<nux::Geometry> const& dirty = wt->GetDrawList();
-  if (!dirty.empty())
+  if (!dirty.empty() || animation_controller_->HasRunningAnimations())
   {
     cScreen->damageRegionSetEnabled(this, false);
     cScreen->damageScreen();
@@ -1867,7 +1873,7 @@
                                                       switcher_controller_->IsShowDesktopDisabled());
 
   if (switcher_controller_->CanShowSwitcher(results))
-    switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);
+    switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, results);
 }
 
 bool UnityScreen::altTabTerminateCommon(CompAction* action,

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-28 10:41:06 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-28 21:43:21 +0000
@@ -246,7 +246,7 @@
   bool TopPanelBackgroundTextureNeedsUpdate() const;
   void UpdateTopPanelBackgroundTexture();
 
-  std::unique_ptr<nux::NuxTimerTickSource> tick_source_;
+  std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
 
   Settings dash_settings_;
@@ -331,6 +331,8 @@
   bool scale_just_activated_;
   WindowMinimizeSpeedController minimize_speed_controller_;
 
+  long long big_tick_;
+
   debug::ScreenIntrospection screen_introspection_;
 
   UBusManager ubus_manager_;

=== modified file 'tests/autopilot/unity/emulators/icons.py'
--- tests/autopilot/unity/emulators/icons.py	2012-09-24 04:19:23 +0000
+++ tests/autopilot/unity/emulators/icons.py	2012-09-28 21:43:21 +0000
@@ -67,6 +67,10 @@
     """Represents the BFB button in the launcher."""
 
 
+class ExpoLauncherIcon(SimpleLauncherIcon):
+    """Represents the Expo button in the launcher."""
+
+
 class HudLauncherIcon(SimpleLauncherIcon):
     """Represents the HUD button in the launcher."""
 

=== modified file 'tests/autopilot/unity/tests/test_home_lens.py'
--- tests/autopilot/unity/tests/test_home_lens.py	2012-05-08 16:13:17 +0000
+++ tests/autopilot/unity/tests/test_home_lens.py	2012-09-28 21:43:21 +0000
@@ -26,7 +26,10 @@
         super(HomeLensSearchTests, self).tearDown()
 
     def test_quick_run_app(self):
-        """Hitting enter runs an application even though a search might not have fully finished yet."""
+        """Hitting enter runs an application even though a search might not have fully
+        finished yet.
+       
+        """
         if self.app_is_running("Text Editor"):
             self.close_all_app("Text Editor")
             sleep(1)

=== modified file 'tests/gmockvolume.c'
--- tests/gmockvolume.c	2012-09-12 10:58:57 +0000
+++ tests/gmockvolume.c	2012-09-28 21:43:21 +0000
@@ -61,6 +61,12 @@
     self->uuid = NULL;
   }
 
+  if (self->label)
+  {
+    g_free(self->label);
+    self->label = NULL;
+  }
+
   if (self->mount)
   {
     g_object_unref(self->mount);
@@ -86,6 +92,7 @@
   guint32 uuid = g_random_int();
   mock_volume->name = g_strdup_printf("MockVolume %u", uuid);
   mock_volume->icon = g_icon_new_for_string("", NULL);
+  mock_volume->label = g_strdup("");
   mock_volume->uuid = g_strdup_printf("%u", uuid);
   mock_volume->mount = NULL;
 }
@@ -153,6 +160,15 @@
   return g_strdup (self->uuid);
 }
 
+void
+g_mock_volume_set_label (GMockVolume *volume, const char* label)
+{
+  if (volume->label)
+    g_free(volume->label);
+
+  volume->label = g_strdup (label);
+}
+
 static GDrive *
 g_mock_volume_get_drive (GVolume *volume)
 {
@@ -254,6 +270,8 @@
 
   if (!g_strcmp0 (kind, G_VOLUME_IDENTIFIER_KIND_UUID))
     return g_strdup (self->uuid);
+  else if (!g_strcmp0 (kind, G_VOLUME_IDENTIFIER_KIND_LABEL))
+    return g_strdup (self->label);
 
   return NULL;
 }

=== modified file 'tests/gmockvolume.h'
--- tests/gmockvolume.h	2012-08-17 15:53:06 +0000
+++ tests/gmockvolume.h	2012-09-28 21:43:21 +0000
@@ -43,6 +43,7 @@
   char *name;
   GIcon *icon;
   char *uuid;
+  char *label;
   GMount *mount;
 };
 
@@ -56,6 +57,7 @@
 void          g_mock_volume_set_can_eject (GMockVolume* volume, gboolean can_eject);
 void          g_mock_volume_set_name  (GMockVolume *volume, const char *name);
 void          g_mock_volume_set_icon  (GMockVolume *volume, GIcon *icon);
+void          g_mock_volume_set_label  (GMockVolume *volume, const char *label);
 void          g_mock_volume_set_uuid  (GMockVolume *volume, const char *uuid);
 void          g_mock_volume_set_mount (GMockVolume *volume, GMount *mount);
 

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2012-08-02 02:30:51 +0000
+++ tests/test_switcher_controller.cpp	2012-09-28 21:43:21 +0000
@@ -135,7 +135,7 @@
   controller.detail_timeout_length = 20000;
   clock_gettime(CLOCK_MONOTONIC, &current);
 
-  controller.Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, false, results);
+  controller.Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, results);
 
   Utils::WaitUntil(controller.detail_timeout_reached_, 3);
   ASSERT_TRUE(controller.detail_timeout_reached_);
@@ -164,7 +164,7 @@
   std::vector<unity::launcher::AbstractLauncherIcon::Ptr> results;
   results.push_back(unity::launcher::AbstractLauncherIcon::Ptr(new unity::launcher::DesktopLauncherIcon()));
 
-  controller.Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, false, results);
+  controller.Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, results);
 
   Utils::WaitUntil(controller.view_shown_, 2);
   ASSERT_TRUE(controller.view_shown_);
@@ -185,7 +185,7 @@
   controller.SetShowDesktopDisabled(true);
   std::vector<unity::launcher::AbstractLauncherIcon::Ptr> results;
 
-  controller.Show(ShowMode::CURRENT_VIEWPORT, SortMode::FOCUS_ORDER, false, results);
+  controller.Show(ShowMode::CURRENT_VIEWPORT, SortMode::FOCUS_ORDER, results);
 
   ASSERT_FALSE(controller.Visible());
 }

=== modified file 'tests/test_volume_imp.cpp'
--- tests/test_volume_imp.cpp	2012-08-28 17:28:02 +0000
+++ tests/test_volume_imp.cpp	2012-09-28 21:43:21 +0000
@@ -98,10 +98,13 @@
 
 TEST_F(TestVolumeImp, TestGetIdentifier)
 {
-  std::string const uuid("0123456789abc");
+  std::string const uuid = "uuid";
+  std::string const label = "label";
 
   g_mock_volume_set_uuid(gvolume_, uuid.c_str());
-  EXPECT_EQ(volume_->GetIdentifier(), uuid);
+  g_mock_volume_set_label(gvolume_, label.c_str());
+
+  EXPECT_EQ(volume_->GetIdentifier(), uuid + "-" + label);
 }
 
 TEST_F(TestVolumeImp, TestIsMounted)

=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2012-09-14 23:28:40 +0000
+++ unity-shared/CoverArt.cpp	2012-09-28 21:43:21 +0000
@@ -334,7 +334,7 @@
   gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
   gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-  if (texture_screenshot_)
+  if (IsFullRedraw() && texture_screenshot_)
   {
     nux::Geometry imageDest = base;
     nux::TexCoordXForm texxform;
@@ -376,7 +376,7 @@
                         texxform,
                         nux::color::White);
   }
-  else
+  else if (IsFullRedraw())
   {
     if (waiting_)
     {  

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2012-09-20 12:52:02 +0000
+++ unity-shared/DashStyle.cpp	2012-09-28 21:43:21 +0000
@@ -2375,7 +2375,7 @@
 
 int Style::GetCategoryHeaderLeftPadding() const
 {
-  return 20;
+  return 19;
 }
 
 int Style::GetCategorySeparatorLeftPadding() const

=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp	2012-09-17 18:33:54 +0000
+++ unity-shared/IconLoader.cpp	2012-09-28 21:43:21 +0000
@@ -302,6 +302,7 @@
       {
         const int SHADOW_BOTTOM_PADDING = 2;
         const int SHADOW_SIDE_PADDING = 1;
+        const int EMBLEM_PADDING = 2;
         int icon_w = gdk_pixbuf_get_width(result);
         int icon_h = gdk_pixbuf_get_height(result);
 
@@ -335,9 +336,16 @@
         pango_layout_set_font_description(layout, desc.get());
         pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
 
-        // magic constant for the text width based on the white curve
-        double max_text_width = has_emblem ?
-          pixbuf_width * 0.72 : pixbuf_width;
+        double belt_w = static_cast<double>(pixbuf_width - SHADOW_SIDE_PADDING * 2);
+        double belt_h = static_cast<double>(pixbuf_height - SHADOW_BOTTOM_PADDING);
+
+        double max_text_width = belt_w;
+        if (has_emblem)
+        {
+          const double CURVE_MID_X = 0.4 * (belt_h / 20.0 * 24.0);
+          const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
+          max_text_width = belt_w - CURVE_MID_X - category_pb_w - EMBLEM_PADDING;
+        }
 
         pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
         pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
@@ -352,7 +360,7 @@
                                            dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
         pango_layout_context_changed(layout);
 
-        // find proper font size (can we do this before the rotation?)
+        // find proper font size
         int text_width, text_height;
         pango_layout_get_pixel_size(layout, &text_width, nullptr);
         while (text_width > max_text_width && font_size > MIN_FONT_SIZE)
@@ -374,23 +382,23 @@
         const double ORANGE_G = 0.28235;
         const double ORANGE_B = 0.07843;
 
-        double belt_w = static_cast<double>(pixbuf_width - SHADOW_SIDE_PADDING * 2);
-        double belt_h = static_cast<double>(pixbuf_height - SHADOW_BOTTOM_PADDING);
-
         // translate to make space for the shadow
         cairo_save(cr.get());
         cairo_translate(cr.get(), 1.0, 1.0);
 
         cairo_set_source_rgba(cr.get(), ORANGE_R, ORANGE_G, ORANGE_B, 1.0);
 
+        // base ribbon
         cairo_rectangle(cr.get(), 0.0, 0.0, belt_w, belt_h);
         cairo_fill_preserve(cr.get());
 
+        // hightlight on left edge
         std::shared_ptr<cairo_pattern_t> pattern(
             cairo_pattern_create_linear(0.0, 0.0, belt_w, 0.0),
             cairo_pattern_destroy);
         cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.235294);
         cairo_pattern_add_color_stop_rgba(pattern.get(), 0.02, 1.0, 1.0, 1.0, 0.0);
+        // and on right one
         if (!has_emblem)
         {
           cairo_pattern_add_color_stop_rgba(pattern.get(), 0.98, 1.0, 1.0, 1.0, 0.0);
@@ -403,27 +411,38 @@
 
         if (has_emblem)
         {
-          // paint the curve
-          const double CURVE_START_XPOS = 0.631163; // 0.651163
-          const double CURVE_CP1_XPOS = CURVE_START_XPOS + 0.068023;
-          const double CURVE_CP2_XPOS = CURVE_START_XPOS + 0.07;
-          const double CURVE_CP3_XPOS = CURVE_START_XPOS + 0.102965;
-          const double CURVE_CP4_XPOS = CURVE_START_XPOS + 0.161511;
-          const double CURVE_CP5_XPOS = CURVE_START_XPOS + 0.197093;
-          const double CURVE_END_XPOS = CURVE_START_XPOS + 0.265779;
-
-          const double CURVE_START_X = CURVE_START_XPOS * belt_w;
+          // size of the emblem
+          const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
+          const int category_pb_h = gdk_pixbuf_get_height(category_pixbuf);
+
+          // control and end points for the two bezier curves
+          const double CURVE_X_MULT = belt_h / 20.0 * 24.0;
+          const double CURVE_CP1_X = 0.25 * CURVE_X_MULT;
+          const double CURVE_CP2_X = 0.2521 * CURVE_X_MULT;
+          const double CURVE_CP3_X = 0.36875 * CURVE_X_MULT;
+          const double CURVE_CP4_X = 0.57875 * CURVE_X_MULT;
+          const double CURVE_CP5_X = 0.705417 * CURVE_X_MULT;
+          const double CURVE_CP6_X = 0.723333 * CURVE_X_MULT;
+          const double CURVE_CP7_X = 0.952375 * CURVE_X_MULT;
+
+          const double CURVE_Y1 = 0.9825;
+          const double CURVE_Y2 = 0.72725;
+          const double CURVE_Y3 = 0.27275;
+
+          const double CURVE_START_X = belt_w - category_pb_w - CURVE_CP5_X - EMBLEM_PADDING;
+          //const double CURVE_END_X = CURVE_START_X + CURVE_X_MULT;
 
           cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
 
-          cairo_move_to(cr.get(), CURVE_START_XPOS * belt_w, belt_h);
-          cairo_curve_to(cr.get(), CURVE_CP1_XPOS * belt_w, belt_h,
-                                   CURVE_CP2_XPOS * belt_w, 0.9825 * belt_h,
-                                   CURVE_CP3_XPOS * belt_w, 0.72725 * belt_h);
-          cairo_line_to(cr.get(), CURVE_CP4_XPOS * belt_w, 0.27275 * belt_h);
-          cairo_curve_to(cr.get(), CURVE_CP5_XPOS * belt_w, 0.0,
-                                   CURVE_CP5_XPOS * belt_w, 0.0,
-                                   CURVE_END_XPOS * belt_w, 0.0);
+          // paint the curved area
+          cairo_move_to(cr.get(), CURVE_START_X, belt_h);
+          cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP1_X, belt_h,
+                                   CURVE_START_X + CURVE_CP2_X, CURVE_Y1 * belt_h,
+                                   CURVE_START_X + CURVE_CP3_X, CURVE_Y2 * belt_h);
+          cairo_line_to(cr.get(), CURVE_START_X + CURVE_CP4_X, CURVE_Y3 * belt_h);
+          cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP5_X, 0.0,
+                                   CURVE_START_X + CURVE_CP6_X, 0.0,
+                                   CURVE_START_X + CURVE_CP7_X, 0.0);
           cairo_line_to(cr.get(), belt_w, 0.0);
           cairo_line_to(cr.get(), belt_w, belt_h);
           cairo_close_path(cr.get());
@@ -440,16 +459,13 @@
           cairo_fill(cr.get());
 
           // paint the emblem
-          int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
-          int category_pb_h = gdk_pixbuf_get_height(category_pixbuf);
-          double category_pb_x = 
-            belt_w - category_pb_w > CURVE_CP4_XPOS * belt_w ?
-              CURVE_CP4_XPOS * belt_w + ((1 - CURVE_CP4_XPOS) * belt_w - category_pb_w) / 2 : CURVE_CP4_XPOS * belt_w;
+          double category_pb_x = belt_w - category_pb_w - EMBLEM_PADDING - 1;
           gdk_cairo_set_source_pixbuf(cr.get(), category_pixbuf,
                                       category_pb_x, (belt_h - category_pb_h) / 2);
           cairo_paint(cr.get());
         }
 
+        // paint the text
         cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
         cairo_move_to(cr.get(), 0.0, belt_h / 2);
         pango_layout_get_pixel_size(layout, nullptr, &text_height);
@@ -463,7 +479,7 @@
 
         pattern.reset(cairo_pattern_create_linear(0.0, belt_h, 0.0, belt_h + SHADOW_BOTTOM_PADDING),
                       cairo_pattern_destroy);
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 0.0, 0.0, 0.0, 0.2);
+        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 0.0, 0.0, 0.0, 0.235294);
         cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.0);
 
         cairo_set_source(cr.get(), pattern.get());
@@ -472,13 +488,11 @@
         cairo_fill(cr.get());
 
         cairo_set_source_rgba(cr.get(), 0.0, 0.0, 0.0, 0.1);
-        cairo_move_to(cr.get(), 0.0, 1.0);
-        cairo_line_to(cr.get(), 0.0, belt_h);
-        cairo_stroke(cr.get());
+        cairo_rectangle(cr.get(), 0.0, 1.0, 1.0, belt_h);
+        cairo_fill(cr.get());
 
-        cairo_move_to(cr.get(), belt_w, 1.0);
-        cairo_line_to(cr.get(), belt_w, belt_h);
-        cairo_stroke(cr.get());
+        cairo_rectangle(cr.get(), belt_w, 1.0, 1.0, belt_h);
+        cairo_fill(cr.get());
 
         // FIXME: going from image_surface to pixbuf, and then to texture :(
         glib::Object<GdkPixbuf> detail_pb(
@@ -533,6 +547,10 @@
         unsigned cat_size = max_font_height * 9 / 8;
         switch (category)
         {
+          case UNITY_PROTOCOL_CATEGORY_TYPE_NONE:
+            // rest of the processing is the CategoryIconLoaded, lets invoke it
+            helper_slot("", -1, cat_size, glib::Object<GdkPixbuf>());
+            break;
           case UNITY_PROTOCOL_CATEGORY_TYPE_APPLICATION:
             helper_handle =
               impl->LoadFromFilename(PKGDATADIR"/emblem_apps.svg", -1, cat_size, helper_slot);
@@ -574,9 +592,8 @@
           case UNITY_PROTOCOL_CATEGORY_TYPE_TOOLS:
           case UNITY_PROTOCOL_CATEGORY_TYPE_CAR:
           default:
-            // rest of the processing is the CategoryIconLoaded, lets invoke it
-            glib::Object<GdkPixbuf> null_pixbuf;
-            helper_slot("", -1, cat_size, null_pixbuf);
+            helper_handle =
+              impl->LoadFromFilename(PKGDATADIR"/emblem_others.svg", -1, cat_size, helper_slot);
             break;
         }
       }

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-09-10 22:44:29 +0000
+++ unity-shared/PluginAdapter.h	2012-09-28 21:43:21 +0000
@@ -180,6 +180,8 @@
   bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window) const;
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
 
+  Window GetTopMostValidWindowInViewport() const;
+
   std::string GetTextProperty(guint32 xid, Atom atom) const;
   std::string GetUtf8Property(guint32 xid, Atom atom) const;
 

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-09-10 22:44:29 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-09-28 21:43:21 +0000
@@ -538,40 +538,35 @@
 bool
 PluginAdapter::IsWindowOnTop(guint32 xid) const
 {
-  Window win = xid;
-  CompWindow* window = m_Screen->findWindow(win);
-
-  if (window)
+  if (xid == GetTopMostValidWindowInViewport())
+    return true;
+
+  return false;
+}
+
+Window PluginAdapter::GetTopMostValidWindowInViewport() const
+{
+  CompWindow* window;
+  CompPoint screen_vp = m_Screen->vp();
+  std::vector<Window> const& our_xids = nux::XInputWindow::NativeHandleList();
+
+  auto const& windows = m_Screen->windows();
+  for (auto it = windows.rbegin(); it != windows.rend(); ++it)
   {
-    if (window->inShowDesktopMode() || !window->isMapped() || !window->isViewable() || window->minimized())
-      return false;
-
-    CompPoint window_vp = window->defaultViewport();
-    nux::Geometry const& window_vp_geo = GetWorkAreaGeometry(window->id());
-    std::vector<Window> const& our_xids = nux::XInputWindow::NativeHandleList();
-
-    for (CompWindow* sibling = window->next; sibling; sibling = sibling->next)
+    window = *it;
+    if (window->defaultViewport() == screen_vp &&
+        window->isViewable() && window->isMapped() &&
+        !window->minimized() && !window->inShowDesktopMode() &&
+        !(window->state() & CompWindowStateAboveMask) &&
+        !(window->type() & CompWindowTypeSplashMask) &&
+        !(window->type() & CompWindowTypeDockMask) &&
+        !window->overrideRedirect() &&
+        std::find(our_xids.begin(), our_xids.end(), window->id()) == our_xids.end())
     {
-      if (sibling->defaultViewport() == window_vp && !sibling->minimized() &&
-          sibling->isMapped() && sibling->isViewable() && !sibling->inShowDesktopMode() &&
-          !(sibling->state() & CompWindowStateAboveMask) &&
-          !(sibling->type() & CompWindowTypeSplashMask) &&
-          !(sibling->type() & CompWindowTypeDockMask) &&
-          /* FIXME: This should be included by the above defaultViewport() check,
-           * but it doesn't seem to work correctly when there's only one workspace
-           * enabled, so please drop the line above when bug #996604 is fixed in
-           * Compiz. */
-          !window_vp_geo.Intersect(GetWindowGeometry(sibling->id())).IsNull() &&
-          std::find(our_xids.begin(), our_xids.end(), sibling->id()) == our_xids.end())
-      {
-        return false;
-      }
+      return window->id();
     }
-
-    return true;
   }
-
-  return false;
+  return 0;
 }
 
 bool

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2012-09-16 12:39:42 +0000
+++ unity-shared/SearchBar.cpp	2012-09-28 21:43:21 +0000
@@ -40,7 +40,7 @@
 
 const int SPACE_BETWEEN_SPINNER_AND_TEXT = 5;
 const int SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10;
-const int LEFT_INTERNAL_PADDING = 6;
+const int LEFT_INTERNAL_PADDING = 4;
 const int SEARCH_ENTRY_RIGHT_BORDER = 10;
 
 const int HIGHLIGHT_HEIGHT = 24;