Merge lp:~brandontschaefer/unity/lp.1239381-fix-7.0 into lp:unity/7.1

[Brandon Schaefer]

Replaces blacklisted characters with '?'. This is a workaround for an issue else where in pango.

*THIS IS A WORKAROUND*

It causes a crash on characters when renderering. So the workaround for now is to replace all blacklisted characters with '?' until this bug is fixed. As we don't want to crash or filter out results.

[Christopher Townsend (townsend)]

+1

review: Approve

[Christopher Townsend (townsend)]

Oops, this was targeted against the wrong Unity branch. I assume this is for Saucy, so it should be targeted for lp:unity/7.1.

review: Disapprove

[Brandon Schaefer (brandontschaefer)]

Dam though saucy was 7.0. Need to make a new branch :)

Unmerged revisions

3323. By Brandon Schaefer on 2014-01-06

* Backport ResultRenderTile workaround where it was crashing in pango based
  on the type of text recived.

3322. By Andrea Azzarone on 2013-08-13

Cherrypick lp:unity rev 3443.

Approved by Stephen M. Webb, PS Jenkins bot.

3321. By PS Jenkins bot on 2013-06-19

Releasing 7.0.0daily13.06.19~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3320. By Łukasz Zemczak on 2013-06-17

Revert changelog entry that never went into ubuntu #nochangelog

3319. By PS Jenkins bot on 2013-05-31

Releasing 7.0.0daily13.05.31~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3318. By William Hua on 2013-05-30

Revert 3196 to fix menu highlighting issues with LibreOffice.

Revision 3196 prevents LibreOffice's menu items from highlighting.
See Launchpad bug #1153350. Fixes: https://bugs.launchpad.net/bugs/1153350.

Approved by PS Jenkins bot, Andrea Azzarone, Marco Trevisan (Treviño).

3317. By Marco Trevisan (Treviño) on 2013-05-30

SwitcherController: use proper long long types for WindowActiveNumber

Otherwise an overflow can cause bad window selection after long uptime. Fixes: https://bugs.launchpad.net/bugs/1181367.

Approved by PS Jenkins bot, Andrea Azzarone, Brandon Schaefer.

3316. By Christopher Townsend on 2013-05-14

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization. This is a backport of lp:unity revno. 3320. Fixes: https://bugs.launchpad.net/bugs/1064155.

Approved by Brandon Schaefer, PS Jenkins bot.

3315. By PS Jenkins bot on 2013-05-08

Releasing 7.0.0daily13.05.08~13.04-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

3314. By Andrea Azzarone on 2013-04-26

Disable detail view for webapp icons. Fixes: https://bugs.launchpad.net/bugs/1169340.

Approved by PS Jenkins bot, Marco Trevisan (Treviño).

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2013-04-30 16:58:48 +0000
+++ dash/ResultRendererTile.cpp	2014-01-07 16:49:23 +0000
@@ -45,6 +45,7 @@
 namespace
 {
 const int FONT_SIZE = 10;
+const char REPLACEMENT_CHAR = '?';
 
 const float CORNER_HIGHTLIGHT_RADIUS = 2.0f;
 
@@ -393,6 +394,55 @@
   }
 }
 
+/* Blacklisted unicode ranges:
+ * Burmese:  U+1000 -> U+109F
+ * Extended: U+AA60 -> U+AA7B
+*/
+bool IsBlacklistedChar(gunichar uni_c)
+{
+  if ((uni_c >= 0x1000 && uni_c <= 0x109F) ||
+      (uni_c >= 0xAA60 && uni_c >= 0xAA7B))
+  {
+    return true;
+  }
+
+  return false;
+}
+
+// FIXME Bug (lp.1239381) in the backend of pango that crashes
+// when using ellipsize with/height setting in pango
+std::string ReplaceBlacklistedChars(std::string const& str)
+{
+  std::string new_string("");
+
+  if (!g_utf8_validate(str.c_str(), -1, NULL))
+    return new_string;
+
+  gchar const* uni_s = str.c_str();
+  gunichar uni_c;
+  gchar utf8_buff[6];
+
+  int size = g_utf8_strlen(uni_s, -1);
+  for (int i = 0; i < size; ++i)
+  {
+    uni_s = g_utf8_next_char(uni_s);
+    uni_c = g_utf8_get_char(uni_s);
+
+    if (IsBlacklistedChar(uni_c))
+    {
+      new_string += REPLACEMENT_CHAR;
+    }
+    else
+    {
+      int end = g_unichar_to_utf8(uni_c, utf8_buff);
+      utf8_buff[end] = '\0';
+
+      new_string += utf8_buff;
+    }
+  }
+
+  return new_string;
+}
 
 void ResultRendererTile::LoadText(Result const& row)
 {
@@ -426,7 +476,10 @@
   pango_layout_set_width(layout, (style.GetTileWidth() - (padding * 2))* PANGO_SCALE);
   pango_layout_set_height(layout, -2);
 
-  char *escaped_text = g_markup_escape_text(row.name().c_str()  , -1);
+  // FIXME bug #1239381
+  std::string name = ReplaceBlacklistedChars(row.name());
+
+  char *escaped_text = g_markup_escape_text(name.c_str(), -1);
 
   pango_layout_set_markup(layout, escaped_text, -1);
 

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2013-05-14 16:04:26 +0000
+++ dash/previews/MusicPreview.cpp	2014-01-07 16:49:23 +0000
@@ -188,6 +188,7 @@
       // Hints && Actions
       nux::VLayout* hints_layout = NULL;
       nux::Layout* actions_layout = NULL;
+<<<<<<< TREE
       bool has_u1_creds = HasUbuntuOneCredentials();
 
       if (has_u1_creds)
@@ -242,6 +243,62 @@
 
       }
      
+=======
+      bool has_u1_creds = HasUbuntuOneCredentials();
+
+      if (has_u1_creds)
+      {
+        if (!preview_model_->GetInfoHints().empty())
+        {
+          hints_layout = new nux::VLayout();
+          hints_layout->SetSpaceBetweenChildren(0);
+          hints_layout->AddSpace(0, 1);
+          preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+          AddChild(preview_info_hints_.GetPointer());
+          preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
+          hints_layout->AddView(preview_info_hints_.GetPointer(), 0);
+
+          // If there are actions, we use a vertical layout
+          action_buttons_.clear();
+          actions_layout = BuildVerticalActionsLayout(preview_model_->GetActions(), action_buttons_);
+          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+        }
+        else // otherwise we add a grid layout.
+        {
+          action_buttons_.clear();
+          actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+          if (action_buttons_.size() < 2)
+            hint_actions_layout->AddSpace(0, 1);
+          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+        }
+      }
+      else
+      {
+        // let the user know he needs to connect
+        previews::Style& style = dash::previews::Style::Instance();
+	actions_layout = new nux::HLayout();
+	nux::VLayout* icon_layout = new nux::VLayout();
+  	icon_layout->SetLeftAndRightPadding(10);
+
+        warning_texture_ = new IconTexture(style.GetWarningIcon());
+        icon_layout->AddView(warning_texture_.GetPointer(), 0, nux::MINOR_POSITION_START,
+          nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
+        actions_layout->AddLayout(icon_layout, 0, nux::MINOR_POSITION_CENTER);
+
+        warning_msg_ = new StaticCairoText(
+                     no_credentials_message_, true,
+                     NUX_TRACKER_LOCATION);
+        warning_msg_->SetFont(style.u1_warning_font().c_str());
+        warning_msg_->SetLines(-2);
+        warning_msg_->SetMinimumHeight(50);
+        warning_msg_->SetMaximumWidth(300);
+
+        actions_layout->AddView(warning_msg_.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
+
+      }
+     
+
+>>>>>>> MERGE-SOURCE
         /////////////////////
 
       if (hints_layout) hint_actions_layout->AddView(hints_layout, 1);

=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2013-05-10 10:07:04 +0000
+++ dash/previews/MusicPreview.h	2014-01-07 16:49:23 +0000
@@ -54,9 +54,15 @@
 
   virtual void SetupViews();
 
+<<<<<<< TREE
   virtual void OnNavigateOut();
 
   bool HasUbuntuOneCredentials();
+=======
+  void OnPlayTrack(std::string const& uri);
+  void OnPauseTrack(std::string const& uri);
+  bool HasUbuntuOneCredentials();
+>>>>>>> MERGE-SOURCE
 
 protected:
   nux::ObjectPtr<Tracks> tracks_;

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-14 11:24:03 +0000
+++ debian/changelog	2014-01-07 16:49:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity (7.1.2+13.10.20131014.1-0ubuntu1) saucy; urgency=low
 
   [ William Grant ]
@@ -1138,6 +1139,77 @@
 
  -- Ubuntu daily release <[e-mail]>  Wed, 10 Apr 2013 07:16:02 +0000
 
+=======
+unity (7.0.0daily13.06.19~13.04-0ubuntu1) raring; urgency=low
+
+  [ William Hua ]
+  * Revert 3196 to fix menu highlighting issues with LibreOffice.
+    Revision 3196 prevents LibreOffice's menu items from highlighting.
+    See Launchpad bug #1153350. (LP: #1153350)
+
+  [ Chris Townsend ]
+  * Fixes issue where minimizing a full screen window would not draw the
+    Launcher and Panel after minimization. This is a backport of
+    lp:unity revno. 3320. (LP: #1064155)
+
+  [ Marco Trevisan (Treviño) ]
+  * SwitcherController: use proper long long types for
+    WindowActiveNumber Otherwise an overflow can cause bad window
+    selection after long uptime. (LP: #1181367)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3319 (bootstrap)
+  * Automatic snapshot from revision 3320
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 19 Jun 2013 04:02:40 +0000
+
+unity (7.0.0daily13.05.08~13.04-0ubuntu1) raring; urgency=low
+
+  [ Sebastien Bacher ]
+  * Some untranslatable and wrong strings in the previews (LP: #1074038)
+
+  [ Andrea Azzarone ]
+  * [alt-tab] Disable detail view for webapp icons. (LP: #1169340)
+
+  [ Marco Trevisan (Treviño) ]
+  * Launcher - count label pops out in auto-hide mode (LP: #1171476)
+  * Panel shadow is drawn above full-screen windows when notifications
+    are shown (LP: #1171934)
+  * [regression] Icon count is not shown if the icon is not transformed
+    (LP: #1171663)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3314
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 08 May 2013 04:37:10 +0000
+
+unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
+
+  [ Manuel de la Pena ]
+  * Purchased songs won't download when not logged to U1 (LP: #1168674)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3309
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 18 Apr 2013 05:43:34 +0000
+
+unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
+
+  [ Marco Trevisan (Treviño) ]
+  * Top Bar, window managment - top bar shadow not falling on restored
+    windows that are partially off the top edge of the screen (LP:
+    #871758)
+
+  [ Matthieu James ]
+  * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
+    #1169238)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3305
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:04 +0000
+
+>>>>>>> MERGE-SOURCE
 unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low
 
   [ Brandon Schaefer ]

=== modified file 'launcher/AbstractLauncherIcon.h'
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-11-20 01:13:03 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-01-07 16:49:23 +0000
@@ -1219,6 +1219,7 @@
   return result;
 }
 
+<<<<<<< TREE
 bool ApplicationLauncherIcon::AllowDetailViewInSwitcher() const
 {
   return app_->type() != "webapp";
@@ -1227,6 +1228,16 @@
 uint64_t ApplicationLauncherIcon::SwitcherPriority()
 {
   uint64_t result = 0;
+=======
+bool ApplicationLauncherIcon::AllowDetailViewInSwitcher() const
+{
+  return app_->type() != "webapp";
+}
+
+unsigned long long ApplicationLauncherIcon::SwitcherPriority()
+{
+  unsigned long long result = 0;
+>>>>>>> MERGE-SOURCE
   // Webapps always go at the back.
   if (app_->type() == "webapp")
     return result;

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-10-10 12:22:47 +0000
+++ launcher/ApplicationLauncherIcon.h	2014-01-07 16:49:23 +0000
@@ -61,8 +61,13 @@
   virtual void UnStick();
 
   virtual bool ShowInSwitcher(bool current);
+<<<<<<< TREE
   virtual bool AllowDetailViewInSwitcher() const override;
   virtual uint64_t SwitcherPriority();
+=======
+  virtual bool AllowDetailViewInSwitcher() const override;
+  virtual unsigned long long SwitcherPriority();
+>>>>>>> MERGE-SOURCE
 
   virtual nux::Color BackgroundColor() const;
 

=== modified file 'launcher/LauncherIcon.cpp'
=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-10-07 23:30:27 +0000
+++ launcher/LauncherIcon.h	2014-01-07 16:49:23 +0000
@@ -113,12 +113,21 @@
     return false;
   };
 
+<<<<<<< TREE
   virtual bool AllowDetailViewInSwitcher() const override
   {
     return false;
   }
 
   virtual uint64_t SwitcherPriority()
+=======
+  virtual bool AllowDetailViewInSwitcher() const override
+  {
+    return false;
+  }
+
+  virtual unsigned long long SwitcherPriority()
+>>>>>>> MERGE-SOURCE
   {
     return 0;
   }

=== modified file 'launcher/MockLauncherIcon.h'
=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-10-02 23:36:48 +0000
+++ launcher/SwitcherController.cpp	2014-01-07 16:49:23 +0000
@@ -605,7 +605,7 @@
     obj_->detail_mode_ = DetailMode::TAB_NEXT_WINDOW;
   }
   else
-  {
+  { 
     model_->detail_selection = false;
   }
 }
@@ -746,19 +746,30 @@
     return;
   }
 
+<<<<<<< TREE
   uint64_t first_highest = 0;
   uint64_t first_second = 0; // first icons second highest active
   uint64_t second_first = 0; // second icons first highest active
+=======
+  unsigned long long first_highest = 0;
+  unsigned long long first_second = 0; // first icons second highest active
+  unsigned long long second_first = 0; // second icons first highest active
+>>>>>>> MERGE-SOURCE
 
   WindowManager& wm = WindowManager::Default();
   for (auto& window : first->Windows())
   {
+<<<<<<< TREE
     Window xid = window->window_id();
     
     if (model_->only_detail_on_viewport && !wm.IsWindowOnCurrentDesktop(xid))
       continue;
 
     uint64_t num = wm.GetWindowActiveNumber(xid);
+=======
+    Window xid = window->window_id();
+    unsigned long long num = wm.GetWindowActiveNumber(xid);
+>>>>>>> MERGE-SOURCE
 
     if (num > first_highest)
     {

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-10-03 13:09:29 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-01-07 16:49:23 +0000
@@ -2595,6 +2595,7 @@
     uScreen->paintDisplay();
   }
 
+<<<<<<< TREE
   enum class DrawPanelShadow
   {
     NO,
@@ -2655,6 +2656,50 @@
   }
 
   if (draw_panel_shadow == DrawPanelShadow::BELOW_WINDOW)
+=======
+  enum class DrawPanelShadow
+  {
+    NO,
+    BELOW_WINDOW,
+    OVER_WINDOW,
+  };
+
+  auto draw_panel_shadow = DrawPanelShadow::NO;
+
+  if (!(mask & PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK))
+  {
+    Window active_window = screen->activeWindow();
+
+    if (G_UNLIKELY(window->type() == CompWindowTypeDesktopMask))
+    {
+      uScreen->setPanelShadowMatrix(matrix);
+
+      if (active_window == 0 || active_window == window->id())
+        draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+    }
+    else
+    {
+      if (window->id() == active_window)
+      {
+        draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
+
+        if (!(window->state() & CompWindowStateMaximizedVertMask) &&
+            !(window->state() & CompWindowStateFullscreenMask) &&
+            !(window->type() & CompWindowTypeFullscreenMask))
+        {
+          auto const& output = uScreen->screen->currentOutputDev();
+
+          if (window->y() - window->border().top < output.y() + uScreen->panel_style_.panel_height)
+          {
+            draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+          }
+        }
+      }
+    }
+  }
+
+  if (draw_panel_shadow == DrawPanelShadow::BELOW_WINDOW)
+>>>>>>> MERGE-SOURCE
     uScreen->paintPanelShadow(region);
 
   bool ret = gWindow->glDraw(matrix, attrib, region, mask);

=== modified file 'plugins/unityshell/src/unityshell.h'
=== modified file 'plugins/unityshell/unityshell.xml.in'
=== modified file 'po/POTFILES.in'
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-10-03 15:15:35 +0000
+++ services/panel-service.c	2014-01-07 16:49:23 +0000
@@ -1528,6 +1528,16 @@
   priv->last_y = 0;
   priv->last_menu_button = 0;
 
+<<<<<<< TREE
+=======
+  g_signal_handler_disconnect (priv->last_menu, priv->last_menu_id);
+  g_signal_handler_disconnect (priv->last_menu, priv->last_menu_move_id);
+
+  GtkWidget *top_win = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
+  if (GTK_IS_WINDOW (top_win))
+    gtk_window_set_attached_to (GTK_WINDOW (top_win), NULL);
+
+>>>>>>> MERGE-SOURCE
   priv->last_menu = NULL;
   priv->last_entry = NULL;
   priv->last_left = 0;
@@ -1978,6 +1988,16 @@
                             G_CALLBACK (menuitem_activated), entry);
         }
 
+      GtkWidget *top_widget = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));
+
+      if (GTK_IS_WINDOW (top_widget))
+        {
+          GtkWindow *top_win = GTK_WINDOW (top_widget);
+
+          if (gtk_window_get_attached_to (top_win) != priv->menubar)
+            gtk_window_set_attached_to (top_win, priv->menubar);
+        }
+
       priv->last_entry = entry;
       priv->last_x = x;
       priv->last_y = y;

=== modified file 'tests/autopilot/unity/tests/__init__.py'
=== modified file 'tests/autopilot/unity/tests/test_panel.py'
=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2013-09-11 07:56:26 +0000
+++ tests/mock-application.h	2014-01-07 16:49:23 +0000
@@ -157,6 +157,7 @@
   bool running_;
   bool urgent_;
   unity::WindowList windows_;
+<<<<<<< TREE
   std::string type_;
   std::vector<std::pair<unity::ApplicationEventType, unity::ApplicationSubjectPtr>> actions_log_;
 
@@ -173,6 +174,19 @@
   MOCK_CONST_METHOD0(Quit, void());
 
   bool LocalOwnsWindow(Window window_id) const {
+=======
+  std::string type_;
+
+
+  virtual std::string icon() const { return icon_; }
+  virtual std::string title() const { return title_; }
+  virtual std::string desktop_file() const { return desktop_file_; }
+  virtual std::string type() const { return type_; }
+  virtual std::string repr() const { return "MockApplication"; }
+
+  virtual unity::WindowList GetWindows() const { return windows_; }
+  virtual bool OwnsWindow(Window window_id) const {
+>>>>>>> MERGE-SOURCE
     auto end = std::end(windows_);
     return std::find_if(std::begin(windows_), end, [window_id] (unity::ApplicationWindowPtr window) {
       return window->window_id() == window_id;

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-11-20 01:13:03 +0000
+++ tests/test_application_launcher_icon.cpp	2014-01-07 16:49:23 +0000
@@ -1080,6 +1080,7 @@
   EXPECT_FALSE(empty_icon->IsFileManager());
   EXPECT_FALSE(mock_icon->IsFileManager());
 
+<<<<<<< TREE
   auto app = std::make_shared<MockApplication::Nice>("/any/path/nautilus.desktop", "Nautilus");
   MockApplicationLauncherIcon::Ptr icon(new NiceMock<MockApplicationLauncherIcon>(app));
   EXPECT_TRUE(icon->IsFileManager());
@@ -1324,3 +1325,28 @@
 }
 
 } // anonymous namespace
+=======
+  auto app = std::make_shared<MockApplication>("/any/path/nautilus.desktop", "Nautilus");
+  nux::ObjectPtr<MockApplicationLauncherIcon> icon(new NiceMock<MockApplicationLauncherIcon>(app));
+  EXPECT_TRUE(icon->IsFileManager());
+
+  app = std::make_shared<MockApplication>("/any/path/nautilus-folder-handler.desktop", "Nautilus");
+  icon = new NiceMock<MockApplicationLauncherIcon>(app);
+  EXPECT_TRUE(icon->IsFileManager());
+
+  app = std::make_shared<MockApplication>("/any/path/nautilus-home.desktop", "Nautilus");
+  icon = new NiceMock<MockApplicationLauncherIcon>(app);
+  EXPECT_TRUE(icon->IsFileManager());
+}
+
+TEST_F(TestApplicationLauncherIcon, AllowDetailViewInSwitcher)
+{
+  mock_app->type_ = "mock";
+  EXPECT_TRUE(mock_icon->AllowDetailViewInSwitcher());
+
+  mock_app->type_ = "webapp";
+  EXPECT_FALSE(mock_icon->AllowDetailViewInSwitcher());
+}
+
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2013-09-29 23:26:29 +0000
+++ tests/test_switcher_controller.cpp	2014-01-07 16:49:23 +0000
@@ -63,6 +63,7 @@
   EXPECT_LT(model->detail_selection.changed.size(), prev_size);
 }
 
+<<<<<<< TREE
 TEST_F(TestSwitcherController, DisconnectWMSignalsOnDestruction)
 {
   auto& color_property = WindowManager::Default().average_color;
@@ -163,6 +164,23 @@
   EXPECT_FALSE(controller_->IsDetailViewShown());
 }
 
+=======
+TEST_F(TestSwitcherController, InitiateDetailWebapps)
+{
+  controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
+
+  controller_->Select(3);
+  controller_->InitiateDetail();
+
+  auto const& view = controller_->GetView();
+  auto const& model = view->GetModel();
+  EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_TILE);
+  EXPECT_FALSE(view->animate());
+  EXPECT_FALSE(model->detail_selection());
+}
+
+
+>>>>>>> MERGE-SOURCE
 TEST_F(TestSwitcherController, ShowSwitcher)
 {
   EXPECT_FALSE(controller_->Visible());

=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2013-06-26 17:10:45 +0000
+++ tests/test_switcher_controller.h	2014-01-07 16:49:23 +0000
@@ -52,7 +52,11 @@
 class FakeApplicationWindow : public unity::ApplicationWindow
 {
 public:
+<<<<<<< TREE
   FakeApplicationWindow(Window xid, uint64_t active_number = 0);
+=======
+  FakeApplicationWindow(Window xid, unsigned long long active_number = 0);
+>>>>>>> MERGE-SOURCE
 
   virtual std::string type() const;
 
@@ -71,6 +75,7 @@
  */
 struct FakeLauncherIcon : unity::launcher::SimpleLauncherIcon
 {
+<<<<<<< TREE
   FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, uint64_t priority);
 
   unity::WindowList Windows() override;
@@ -79,6 +84,16 @@
 
   bool allow_detail_view_;
   uint64_t priority_;
+=======
+  FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned long long priority);
+
+  unity::WindowList Windows() override;
+  bool AllowDetailViewInSwitcher() const override;
+  unsigned long long SwitcherPriority() override;
+
+  bool allow_detail_view_;
+  unsigned long long priority_;
+>>>>>>> MERGE-SOURCE
   unity::WindowList window_list;
 };
 

=== modified file 'tests/test_switcher_controller_class.cpp'
--- tests/test_switcher_controller_class.cpp	2013-06-26 17:10:45 +0000
+++ tests/test_switcher_controller_class.cpp	2014-01-07 16:49:23 +0000
@@ -25,6 +25,7 @@
 using namespace unity::switcher;
 using namespace std::chrono;
 
+<<<<<<< TREE
 FakeApplicationWindow::FakeApplicationWindow(Window xid, uint64_t active_number)
   : xid_(xid)
 {
@@ -37,6 +38,19 @@
   icon.SetGetterFunction([this] { return ""; });
 }
 
+=======
+FakeApplicationWindow::FakeApplicationWindow(Window xid, unsigned long long active_number)
+  : xid_(xid)
+{
+  auto WM = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
+  auto standalone_window = std::make_shared<StandaloneWindow>(xid_);
+  standalone_window->active_number = active_number;
+  WM->AddStandaloneWindow(standalone_window);
+}
+
+std::string FakeApplicationWindow::title() const { return "FakeApplicationWindow"; }
+std::string FakeApplicationWindow::icon() const { return ""; }
+>>>>>>> MERGE-SOURCE
 std::string FakeApplicationWindow::type() const { return "mock"; }
 
 Window FakeApplicationWindow::window_id() const { return xid_; }
@@ -45,7 +59,11 @@
 bool FakeApplicationWindow::Focus() const { return false; }
 void FakeApplicationWindow::Quit() const { WindowManager::Default().Close(xid_); }
 
+<<<<<<< TREE
 FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, uint64_t priority)
+=======
+FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned long long priority)
+>>>>>>> MERGE-SOURCE
   : launcher::SimpleLauncherIcon(IconType::APPLICATION)
   , allow_detail_view_(allow_detail_view)
   , priority_(priority)
@@ -60,6 +78,7 @@
   return window_list;
 }
 
+<<<<<<< TREE
 bool FakeLauncherIcon::AllowDetailViewInSwitcher() const
 {
   return allow_detail_view_;
@@ -68,6 +87,16 @@
 uint64_t FakeLauncherIcon::SwitcherPriority()
 {
   return std::numeric_limits<uint64_t>::max() - priority_;
+=======
+bool FakeLauncherIcon::AllowDetailViewInSwitcher() const
+{
+  return allow_detail_view_;
+}
+
+unsigned long long FakeLauncherIcon::SwitcherPriority()
+{
+  return std::numeric_limits<unsigned long long>::max() - priority_;
+>>>>>>> MERGE-SOURCE
 }
 
 /**

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2013-10-04 00:46:07 +0000
+++ unity-shared/IconRenderer.cpp	2014-01-07 16:49:23 +0000
@@ -301,8 +301,13 @@
     if (it->render_center == launcher_icon->LastRenderCenter(monitor) &&
         it->logical_center == launcher_icon->LastLogicalCenter(monitor) &&
         it->rotation == launcher_icon->LastRotation(monitor) &&
+<<<<<<< TREE
         it->skip == launcher_icon->WasSkipping(monitor) &&
         (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem(monitor))
+=======
+        it->skip == launcher_icon->WasSkipping(monitor) &&
+        (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem())
+>>>>>>> MERGE-SOURCE
     {
       continue;
     }
@@ -310,7 +315,11 @@
     launcher_icon->RememberCenters(monitor, it->render_center, it->logical_center);
     launcher_icon->RememberRotation(monitor, it->rotation);
     launcher_icon->RememberSkip(monitor, it->skip);
+<<<<<<< TREE
     launcher_icon->RememberEmblem(monitor, launcher_icon->Emblem() != nullptr);
+=======
+    launcher_icon->RememberEmblem(launcher_icon->Emblem() != nullptr);
+>>>>>>> MERGE-SOURCE
 
     float w = icon_size;
     float h = icon_size;

=== modified file 'unity-shared/IconTextureSource.cpp'
--- unity-shared/IconTextureSource.cpp	2013-10-04 00:46:07 +0000
+++ unity-shared/IconTextureSource.cpp	2014-01-07 16:49:23 +0000
@@ -32,8 +32,13 @@
 }
 
 IconTextureSource::IconTextureSource()
+<<<<<<< TREE
   : skip_(RENDERERS_SIZE, false)
   , had_emblem_(RENDERERS_SIZE, false)
+=======
+  : had_emblem_(false)
+  , skip_(RENDERERS_SIZE, false)
+>>>>>>> MERGE-SOURCE
   , last_render_center_(RENDERERS_SIZE)
   , last_logical_center_(RENDERERS_SIZE)
   , last_rotation_(RENDERERS_SIZE)
@@ -81,6 +86,7 @@
   return skip_[monitor];
 }
 
+<<<<<<< TREE
 void IconTextureSource::RememberEmblem(int monitor, bool has_emblem)
 {
   had_emblem_[monitor] = has_emblem;
@@ -91,5 +97,17 @@
   return had_emblem_[monitor];
 }
 
+=======
+void IconTextureSource::RememberEmblem(bool has_emblem)
+{
+  had_emblem_ = has_emblem;
+}
+
+bool IconTextureSource::HadEmblem() const
+{
+  return had_emblem_;
+}
+
+>>>>>>> MERGE-SOURCE
 }
 }
\ No newline at end of file

=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2013-10-04 00:46:07 +0000
+++ unity-shared/IconTextureSource.h	2014-01-07 16:49:23 +0000
@@ -58,9 +58,15 @@
   void RememberSkip(int monitor, bool skip);
   bool WasSkipping(int monitor) const;
 
+<<<<<<< TREE
   void RememberEmblem(int monitor, bool has_emblem);
   bool HadEmblem(int monitor) const;
 
+=======
+  void RememberEmblem(bool has_emblem);
+  bool HadEmblem() const;
+
+>>>>>>> MERGE-SOURCE
   virtual nux::Color BackgroundColor() const = 0;
 
   virtual nux::Color GlowColor() = 0;
@@ -70,6 +76,7 @@
   virtual nux::BaseTexture* Emblem() = 0;
 
 private:
+  bool had_emblem_;
   std::vector<bool> skip_;
   std::vector<bool> had_emblem_;
   std::vector<nux::Point3> last_render_center_;

=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2013-05-10 10:07:04 +0000
+++ unity-shared/PreviewStyle.cpp	2014-01-07 16:49:23 +0000
@@ -294,6 +294,7 @@
   return 12;
 }
 
+<<<<<<< TREE
 std::string Style::payment_title_font() const
 {
   return "Ubuntu 22";
@@ -384,6 +385,13 @@
   return "Ubuntu Bold 11.5";
 }
 
+=======
+std::string Style::u1_warning_font() const
+{
+  return "Ubuntu Bold 11.5";
+}
+
+>>>>>>> MERGE-SOURCE
 float Style::GetVideoImageAspectRatio() const
 {
   return float(540)/380;
@@ -493,6 +501,7 @@
   return pimpl->preview_pause_texture_.texture();
 }
 
+<<<<<<< TREE
 nux::BaseTexture* Style::GetLockIcon()
 {
   return nux::CreateTexture2DFromFile(
@@ -504,6 +513,13 @@
   return pimpl->warning_icon_texture_.texture();
 }
 
+=======
+nux::BaseTexture* Style::GetWarningIcon()
+{
+  return pimpl->warning_icon_texture_.texture();
+}
+
+>>>>>>> MERGE-SOURCE
 nux::BaseTexture* Style::GetSearchSpinIcon(int size)
 {
   return pimpl->preview_spin_texture_.texture(size);

=== modified file 'unity-shared/PreviewStyle.h'
=== modified file 'unity-shared/StandaloneWindowManager.cpp'
=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-09-14 09:56:10 +0000
+++ unity-shared/StandaloneWindowManager.h	2014-01-07 16:49:23 +0000
@@ -44,7 +44,11 @@
   nux::Size deco_sizes[4];
   unsigned current_desktop;
   unsigned monitor;
+<<<<<<< TREE
   uint64_t active_number;
+=======
+  unsigned long long active_number;
+>>>>>>> MERGE-SOURCE
   nux::Property<bool> active;
   nux::Property<bool> mapped;
   nux::Property<bool> visible;