Merge lp:~3v1n0/unity/memory-fixes into lp:unity

[Marco Trevisan (Treviño)]

Unity: improve the correctness of the memory usage of various components

Thanks to valgrind...

Fix various read/write errors or leaks found through valgrind that should prevent crashes during tests or runtime.

Bumping ABI as requested by lp:~3v1n0/nux/memory-fixes

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/171/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/127
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/127

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3451
http://jenkins.qa.ubuntu.com/job/unity-ci/259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/147/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/259/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'UnityCore/Model-inl.h'
--- UnityCore/Model-inl.h	2013-05-17 22:53:57 +0000
+++ UnityCore/Model-inl.h	2013-07-18 23:02:25 +0000
@@ -44,9 +44,9 @@
 void Model<RowAdaptor>::Init ()
 {
   swarm_name.changed.connect(sigc::mem_fun(this, &Model<RowAdaptor>::OnSwarmNameChanged));
-  count.SetGetterFunction(sigc::mem_fun(this, &Model<RowAdaptor>::get_count));
-  seqnum.SetGetterFunction(sigc::mem_fun(this, &Model<RowAdaptor>::get_seqnum));
-  model.SetGetterFunction(sigc::mem_fun(this, &Model<RowAdaptor>::get_model));
+  count.SetGetterFunction(std::bind(&Model<RowAdaptor>::get_count, this));
+  seqnum.SetGetterFunction(std::bind(&Model<RowAdaptor>::get_seqnum, this));
+  model.SetGetterFunction(std::bind(&Model<RowAdaptor>::get_model, this));
 }
 
 template<class RowAdaptor>
 
=== modified file 'dash/previews/TabIterator.cpp'
--- dash/previews/TabIterator.cpp	2013-01-22 11:25:38 +0000
+++ dash/previews/TabIterator.cpp	2013-07-18 23:02:25 +0000
@@ -32,10 +32,7 @@
 
 void TabIterator::Remove(nux::InputArea* area)
 {
-  std::list<nux::InputArea*>::iterator it = std::find(areas_.begin(), areas_.end(),
-    area);
-  if (it != areas_.end())
-    areas_.erase(it);
+  areas_.remove(area);
 }
 
 void TabIterator::Prepend(nux::InputArea* area)
@@ -50,11 +47,11 @@
   areas_.push_back(area);
 }
 
-void TabIterator::Insert(nux::InputArea* area, int index)
+void TabIterator::Insert(nux::InputArea* area, unsigned index)
 {
   Remove(area);
   std::list<nux::InputArea*>::iterator it = areas_.begin();
-  if ((uint)index < areas_.size())
+  if (index < areas_.size())
   {
     std::advance(it, index);
     areas_.insert(it, area);
@@ -126,12 +123,12 @@
     if (direction == nux::KEY_NAV_TAB_PREVIOUS)
     {
       if (it == areas_.begin())
-        return *areas_.end();
+        return *areas_.rbegin();
       else
       {
         it--;
         if (it == areas_.begin())
-          return *areas_.end();
+          return *areas_.rbegin();
         return *it;
       }
     }
@@ -156,7 +153,7 @@
   {
     if (direction == nux::KEY_NAV_TAB_PREVIOUS)
     {
-      return *areas_.end();
+      return *areas_.rbegin();
     }
     else if (direction == nux::KEY_NAV_TAB_NEXT)
     {
 
=== modified file 'dash/previews/TabIterator.h'
--- dash/previews/TabIterator.h	2013-01-22 11:54:25 +0000
+++ dash/previews/TabIterator.h	2013-07-18 23:02:25 +0000
@@ -41,7 +41,7 @@
 
   void Prepend(nux::InputArea* area);
   void Append(nux::InputArea* area);
-  void Insert(nux::InputArea* area, int index);
+  void Insert(nux::InputArea* area, unsigned index);
   void InsertBefore(nux::InputArea* area, nux::InputArea* after);
   void InsertAfter(nux::InputArea* area, nux::InputArea* before);
   void Remove(nux::InputArea* area);
@@ -53,7 +53,8 @@
                                    unsigned long special_keys_state);
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
-protected:
+private:
+  friend class TestTabIterator;
   std::list<nux::InputArea*> areas_;
 };
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-15 10:00:58 +0000
+++ debian/changelog	2013-07-18 23:02:25 +0000
@@ -1,7 +1,9 @@
 unity (7.0.2+13.10.20130705.1-0ubuntu4) UNRELEASED; urgency=low
 
-  * debian/control: build-depends on xserver-xorg-video-dummy and libgl1-mesa-dri
-
+  * debian/control:
+    - build-depend on xserver-xorg-video-dummy and libgl1-mesa-dri
+    - build-depend on libnux-4.0-dev (>= 4.0.2+13.10.20130718.1)
+ 
  -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 09 Jul 2013 03:55:14 +0200
 
 unity (7.0.2+13.10.20130705.1-0ubuntu3) saucy; urgency=low
 
=== modified file 'debian/control'
--- debian/control	2013-07-15 10:00:58 +0000
+++ debian/control	2013-07-18 23:02:25 +0000
@@ -32,7 +32,7 @@
                libjson-glib-dev,
                libjson-perl,
                libnotify-dev,
-               libnux-4.0-dev (>= 4.0.2),
+               libnux-4.0-dev (>= 4.0.2+13.10.20130718.1),
                libpango1.0-dev,
                libsigc++-2.0-dev,
                libstartup-notification0-dev,
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-07-01 21:20:51 +0000
+++ launcher/Launcher.cpp	2013-07-18 23:02:25 +0000
@@ -157,6 +157,7 @@
   , _drag_out_delta_x(0.0f)
   , _drag_gesture_ongoing(false)
   , _last_reveal_progress(0.0f)
+  , _drag_action(nux::DNDACTION_NONE)
   , _selection_atom(0)
   , icon_renderer(std::make_shared<ui::IconRenderer>())
 {
 
=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2013-07-01 10:43:39 +0000
+++ launcher/TrashLauncherIcon.cpp	2013-07-18 23:02:25 +0000
@@ -42,6 +42,7 @@
 
 TrashLauncherIcon::TrashLauncherIcon(FileManager::Ptr const& fmo)
   : SimpleLauncherIcon(IconType::TRASH)
+  , empty_(true)
   , file_manager_(fmo ? fmo : GnomeFileManager::Get())
 {
   tooltip_text = _("Trash");
 
=== modified file 'tests/test_filter_multirange.h'
--- tests/test_filter_multirange.h	2012-12-20 10:42:49 +0000
+++ tests/test_filter_multirange.h	2013-07-18 23:02:25 +0000
@@ -42,26 +42,22 @@
 
 GVariant* AddFilterOptions(std::vector<bool> option_active)
 {
-  GVariantBuilder* builder;
-  builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
+  GVariantBuilder builder;
+  g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
 
-  int i = 0;
-  for (auto iter = option_active.begin(), end = option_active.end(); iter != end; ++iter)
+  for (unsigned i = 1; i <= option_active.size(); ++i)
   {
-    std::stringstream name;
-    name << i++;
-
-    const char* pstr_name = name.str().c_str();
-
-    g_variant_builder_add (builder, "(sssb)", pstr_name, pstr_name, "", FALSE);
+    auto pstr_name = std::to_string(i);
+
+    g_variant_builder_add(&builder, "(sssb)", pstr_name.c_str(), pstr_name.c_str(), "", FALSE);
   }
-  return g_variant_builder_end (builder);
+  return g_variant_builder_end(&builder);
 }
 
 void ExpectFilterRange(unity::dash::MultiRangeFilter::Ptr const& filter, int first, int last)
 {
   int i = 0;
-  for (auto option : filter->options())
+  for (auto const& option : filter->options())
   {
     bool should_be_active = i >= first && i <= last;
     EXPECT_EQ(option->active, should_be_active);
 
=== modified file 'tests/test_glib_signals.cpp'
--- tests/test_glib_signals.cpp	2012-08-15 16:58:14 +0000
+++ tests/test_glib_signals.cpp	2013-07-18 23:02:25 +0000
@@ -34,8 +34,7 @@
 
   virtual ~TestGLibSignals()
   {
-    if (G_IS_OBJECT(test_signals_))
-      g_object_unref(test_signals_);
+    g_object_unref(test_signals_);
   }
 
   void Signal0Callback(TestSignals* signals)
@@ -274,7 +273,7 @@
   Signal<void, TestSignals*> signal;
   signal.Connect(test_signals_, "signal0",
                  sigc::mem_fun(this, &TestGLibSignals::Signal0Callback));
-  g_object_unref(test_signals_);
+  g_clear_object(&test_signals_);
   EXPECT_EQ(signal.object(), nullptr);
 }
 
@@ -438,7 +437,7 @@
                                                                              sigc::mem_fun(this, &TestGLibSignals::Signal5Callback));
   manager.Add<gboolean, TestSignals*, const char*, int, float, double, gboolean, char>(test_signals_, "signal6", sigc::mem_fun(this, &TestGLibSignals::Signal6Callback));
 
-  g_object_unref(test_signals_);
+  g_clear_object(&test_signals_);
   EXPECT_TRUE(manager.GetConnections().empty());
 }
 
 
=== modified file 'tests/test_grabhandle.cpp'
--- tests/test_grabhandle.cpp	2012-11-15 17:56:23 +0000
+++ tests/test_grabhandle.cpp	2013-07-18 23:02:25 +0000
@@ -147,14 +147,11 @@
 protected:
 
   UnityMTGrabHandleTest() :
-    handlesMask (0),
-    window (new MockGrabHandleWindow)
-  {
-
-  }
+    handlesMask(0)
+  {}
 
   unsigned int handlesMask;
-  MockGrabHandleWindow *window;
+  MockGrabHandleWindow window;
 };
 
 TEST_F(UnityMTGrabHandleTest, TestLayoutMasks) {
@@ -209,7 +206,7 @@
   for (unsigned int i = 0; i < unity::MT::NUM_HANDLES; i++)
     textures.push_back (TextureSize (MockGrabHandleTextureFactory::Default ()->create (), nux::Geometry (0, 0, 100, 100)));
 
-  GrabHandleGroup::Ptr group = GrabHandleGroup::create (window, textures);
+  GrabHandleGroup::Ptr group = GrabHandleGroup::create (&window, textures);
 
   group->relayout (nux::Geometry (250, 250, 1000, 1000), true);
 
@@ -253,7 +250,7 @@
   for (unsigned int i = 0; i < unity::MT::NUM_HANDLES; i++)
     textures.push_back (TextureSize (MockGrabHandleTextureFactory::Default ()->create (), nux::Geometry (0, 0, 100, 100)));
 
-  GrabHandleGroup::Ptr group = GrabHandleGroup::create (window, textures);
+  GrabHandleGroup::Ptr group = GrabHandleGroup::create (&window, textures);
 
   group->show (0);
   group->show (TopLeftHandle | TopHandle | TopRightHandle);
@@ -280,7 +277,7 @@
   for (unsigned int i = 0; i < unity::MT::NUM_HANDLES; i++)
     textures.push_back (TextureSize (MockGrabHandleTextureFactory::Default ()->create (), nux::Geometry (0, 0, 100, 100)));
 
-  GrabHandleGroup::Ptr group = GrabHandleGroup::create (window, textures);
+  GrabHandleGroup::Ptr group = GrabHandleGroup::create (&window, textures);
 
   group->show ();
   for (unsigned int i = 0; i < unity::MT::FADE_MSEC; i++)
 
=== modified file 'tests/test_icon_loader.cpp'
--- tests/test_icon_loader.cpp	2013-07-09 03:46:49 +0000
+++ tests/test_icon_loader.cpp	2013-07-18 23:02:25 +0000
@@ -87,47 +87,57 @@
   }
 }
 
-
-TEST(TestIconLoader, TestGetDefault)
-{
-  // we need to initialize gtk
-  int args_cnt = 0;
-  gtk_init (&args_cnt, NULL);
-
-  IconLoader::GetDefault();
-}
-
-TEST(TestIconLoader, TestGetOneIcon)
-{
-  LoadResult load_result;
-  IconLoader& icon_loader = IconLoader::GetDefault();
-
-  icon_loader.LoadFromIconName("python", -1, 48, sigc::mem_fun(load_result,
-        &LoadResult::IconLoaded));
-
-  Utils::WaitUntilMSec(load_result.got_callback);
-  EXPECT_TRUE(load_result.got_callback);
-  EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
-}
-
-TEST(TestIconLoader, TestGetAnnotatedIcon)
-{
-  LoadResult load_result;
-  IconLoader& icon_loader = IconLoader::GetDefault();
-
-  icon_loader.LoadFromGIconString(". UnityProtocolAnnotatedIcon %7B'base-icon':%20%3C'cmake'%3E,%20'ribbon':%20%3C'foo'%3E%7D", -1, 48, sigc::mem_fun(load_result,
-        &LoadResult::IconLoaded));
-
-  Utils::WaitUntilMSec(load_result.got_callback);
-  EXPECT_TRUE(load_result.got_callback);
-  EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
-}
-
-TEST(TestIconLoader, TestGetOneIconManyTimes)
+struct TestIconLoader : testing::Test
+{
+  TestIconLoader()
+    : icon_loader(IconLoader::GetDefault())
+  {}
+
+  void TearDown() override
+  {
+    for (int handle : handles_)
+      icon_loader.DisconnectHandle(handle);
+  }
+
+  IconLoader& icon_loader;
+  std::vector<int> handles_;
+};
+
+TEST_F(TestIconLoader, TestGetDefault)
+{
+  EXPECT_EQ(&icon_loader, &IconLoader::GetDefault());
+}
+
+TEST_F(TestIconLoader, TestGetOneIcon)
+{
+  LoadResult load_result;
+
+  int handle = icon_loader.LoadFromIconName("python", -1, 48, sigc::mem_fun(load_result,
+        &LoadResult::IconLoaded));
+  handles_.push_back(handle);
+
+  Utils::WaitUntilMSec(load_result.got_callback);
+  EXPECT_TRUE(load_result.got_callback);
+  EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
+}
+
+TEST_F(TestIconLoader, TestGetAnnotatedIcon)
+{
+  LoadResult load_result;
+
+  int handle = icon_loader.LoadFromGIconString(". UnityProtocolAnnotatedIcon %7B'base-icon':%20%3C'cmake'%3E,%20'ribbon':%20%3C'foo'%3E%7D", -1, 48, sigc::mem_fun(load_result,
+        &LoadResult::IconLoaded));
+  handles_.push_back(handle);
+
+  Utils::WaitUntilMSec(load_result.got_callback);
+  EXPECT_TRUE(load_result.got_callback);
+  EXPECT_TRUE(IsValidPixbuf(load_result.pixbuf));
+}
+
+TEST_F(TestIconLoader, TestGetOneIconManyTimes)
 {
   std::vector<LoadResult> results;
   std::vector<int> handles;
-  IconLoader& icon_loader = IconLoader::GetDefault();
   int i, load_count;
 
   // 100 times should be good
@@ -141,6 +151,7 @@
   {
     handles[i] = icon_loader.LoadFromIconName("debian-logo", -1, 48,
         sigc::mem_fun(results[i], &LoadResult::IconLoaded));
+    handles_.push_back(handles[i]);
   }
 
   // disconnect every other handler (and especially the first one)
@@ -154,10 +165,9 @@
 }
 
 // Disabled until we have the new thread safe lp:fontconfig
-TEST(TestIconLoader, DISABLED_TestGetManyIcons)
+TEST_F(TestIconLoader, DISABLED_TestGetManyIcons)
 {
   std::vector<LoadResult> results;
-  IconLoader& icon_loader = IconLoader::GetDefault();
   int i = 0;
   int icon_count;
 
@@ -169,19 +179,18 @@
   for (GList *it = icons; it != NULL; it = it->next)
   {
     const char *icon_name = static_cast<char*>(it->data);
-    icon_loader.LoadFromIconName(icon_name, -1, 48, sigc::mem_fun(results[i++],
-        &LoadResult::IconLoaded));
+    int handle = icon_loader.LoadFromIconName(icon_name, -1, 48, sigc::mem_fun(results[i++], &LoadResult::IconLoaded));
+    handles_.push_back(handle);
     if (i >= icon_count) break;
   }
 
   CheckResults(results);
 }
 
-TEST(TestIconLoader, TestCancelSome)
+TEST_F(TestIconLoader, TestCancelSome)
 {
   std::vector<LoadResult> results;
   std::vector<int> handles;
-  IconLoader& icon_loader = IconLoader::GetDefault();
   int i = 0;
   int icon_count;
 
@@ -197,6 +206,7 @@
     int handle = icon_loader.LoadFromIconName(icon_name, -1, 48, sigc::mem_fun(
           results[i], &LoadResult::IconLoaded));
     handles[i++] = handle;
+    handles_.push_back(handle);
     if (i >= icon_count) break;
   }
 
 
=== modified file 'tests/test_launcher_entry_remote.cpp'
--- tests/test_launcher_entry_remote.cpp	2012-03-28 15:40:13 +0000
+++ tests/test_launcher_entry_remote.cpp	2013-07-18 23:02:25 +0000
@@ -153,6 +153,7 @@
   g_variant_get(parameters, "(&sa{sv})", &app_uri, &prop_iter);
   entry1.Update(prop_iter);
   g_variant_iter_free(prop_iter);
+  g_variant_unref(parameters);
 
   EXPECT_EQ(entry1.DBusName(), "Entry1");
   EXPECT_EQ(entry1.AppUri(), "AppURI1");
 
=== modified file 'tests/test_preview_player.cpp'
--- tests/test_preview_player.cpp	2013-07-09 18:10:15 +0000
+++ tests/test_preview_player.cpp	2013-07-18 23:02:25 +0000
@@ -150,7 +150,7 @@
       : server_(PLAYER_NAME)
     {
       server_.AddObjects(PLAYER_INTERFACE, PLAYER_PATH);
-      auto const& object = server_.GetObjects().front();
+      auto object = server_.GetObjects().front();
 
       object->SetMethodsCallsHandler([this, object] (std::string const& method, GVariant* parameters) {
         if (method == "Play")
 
=== modified file 'tests/test_previews.cpp'
--- tests/test_previews.cpp	2013-02-27 18:04:26 +0000
+++ tests/test_previews.cpp	2013-07-18 23:02:25 +0000
@@ -42,6 +42,11 @@
   return g_variant_get_type_string(variant) != NULL;
 }
 
+static void g_variant_unref0(gpointer var)
+{
+  if (var) g_variant_unref((GVariant*)var);
+}
+
 TEST(TestPreviews, DeserializeGeneric)
 {
   Object<GIcon> icon(g_icon_new_for_string("accessories", NULL));
@@ -77,7 +82,7 @@
   unity_protocol_preview_set_image(proto_obj, icon);
   unity_protocol_preview_set_image_source_uri(proto_obj, "Source");
 
-  GHashTable* hints = g_hash_table_new(g_str_hash, g_str_equal);
+  GHashTable* hints = g_hash_table_new_full(g_str_hash, g_direct_equal, g_free, g_variant_unref0);
   g_hash_table_insert(hints, g_strdup("extra-text"), g_variant_new_string("Foo"));
   unity_protocol_preview_add_action(proto_obj, "action1", "Action #1", NULL, 0);
   unity_protocol_preview_add_action_with_hints(proto_obj, "action2", "Action #2", NULL, 0, hints);
 
=== modified file 'tests/test_quicklist_menu_item.cpp'
--- tests/test_quicklist_menu_item.cpp	2013-03-19 18:47:01 +0000
+++ tests/test_quicklist_menu_item.cpp	2013-07-18 23:02:25 +0000
@@ -167,7 +167,9 @@
   XEvent xevent;
   xevent.type = ButtonPress;
   xevent.xany.display = nux::GetGraphicsDisplay()->GetX11Display();
+  xevent.xany.window = nux::GetGraphicsDisplay()->GetWindowHandle();
   xevent.xbutton.time = g_random_int();
+  xevent.xbutton.button = Button1;
   nux::GetGraphicsDisplay()->ProcessXEvent(xevent, true);
 
   auto event_time = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
 
=== modified file 'tests/test_scope.cpp'
--- tests/test_scope.cpp	2013-07-09 18:56:00 +0000
+++ tests/test_scope.cpp	2013-07-18 23:02:25 +0000
@@ -18,7 +18,7 @@
  */
 
 #include <boost/lexical_cast.hpp>
-#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 #include <glib-object.h>
 #include <unity-protocol.h>
 
@@ -43,7 +43,9 @@
 const std::string SCOPE_NAME = "testscope1.scope";
 }
 
-class TestScope : public ::testing::Test
+using namespace testing;
+
+class TestScope : public Test
 {
 public:
   TestScope() { }
@@ -216,6 +218,10 @@
   Results::Ptr category_model1 = scope_->GetResultsForCategory(1);
   Results::Ptr category_model2 = scope_->GetResultsForCategory(2);
 
+  ASSERT_THAT(category_model0, NotNull());
+  ASSERT_THAT(category_model1, NotNull());
+  ASSERT_THAT(category_model2, NotNull());
+
   EXPECT_EQ(category_model0->count(), 5) << "Category 0 result count not as expected (" << category_model0->count() << " != 5)";
   EXPECT_EQ(category_model1->count(), 4) << "Category 1 result count not as expected (" << category_model1->count() << " != 4)";
   EXPECT_EQ(category_model2->count(), 4) << "Category 2 result count not as expected (" << category_model2->count() << " != 4)";
 
=== modified file 'tests/test_session_controller.cpp'
--- tests/test_session_controller.cpp	2013-03-19 18:47:01 +0000
+++ tests/test_session_controller.cpp	2013-07-18 23:02:25 +0000
@@ -54,7 +54,7 @@
   nux::NuxTimerTickSource tick_source;
   nux::animation::AnimationController animation_controller;
   unity::Settings settings;
-  MockManager::Ptr manager;
+  MockManager::Ptr manager ;
   ControllerWrap controller;
 };
 
 
=== modified file 'tests/test_tabiterator.cpp'
--- tests/test_tabiterator.cpp	2013-01-22 11:54:25 +0000
+++ tests/test_tabiterator.cpp	2013-07-18 23:02:25 +0000
@@ -17,6 +17,7 @@
  * <http://www.gnu.org/licenses/>
  *
  * Authored by: Manuel de la Pena <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  *
  */
 
@@ -38,341 +39,359 @@
 namespace previews
 {
 
-class MockedTabIterator : public TabIterator
-{
-public:
-  using TabIterator::areas_;
-};
-
-class TestTabIterator : public ::testing::Test
-{
-  protected:
-    TestTabIterator() : Test(),
-      tab_iterator(new MockedTabIterator())
-    {
-    }
-
-
-    std::unique_ptr<MockedTabIterator> tab_iterator;
+typedef nux::ObjectPtr<IMTextEntry> IMTextEntryPtr;
+
+struct TestTabIterator : ::testing::Test
+{
+  struct MockedTabIterator : public TabIterator
+  {
+    using TabIterator::areas_;
+  };
+
+  MockedTabIterator tab_iterator;
 };
 
 TEST_F(TestTabIterator, DoRemove)
 {
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(entry);
-  tab_iterator->Remove(entry);
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(entry.GetPointer());
+  tab_iterator.Remove(entry.GetPointer());
 
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator->areas_.begin(),
-    tab_iterator->areas_.end(), entry);
-  EXPECT_EQ(it, tab_iterator->areas_.end());
+  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
+    tab_iterator.areas_.end(), entry.GetPointer());
+  EXPECT_EQ(it, tab_iterator.areas_.end());
 }
 
 TEST_F(TestTabIterator, DoRemoveMissing)
 {
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Remove(entry);
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Remove(entry.GetPointer());
 
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator->areas_.begin(),
-    tab_iterator->areas_.end(), entry);
-  EXPECT_EQ(it, tab_iterator->areas_.end());
+  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
+    tab_iterator.areas_.end(), entry.GetPointer());
+  EXPECT_EQ(it, tab_iterator.areas_.end());
 }
 
 TEST_F(TestTabIterator, Prepend)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 10; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Prepend(entry);
-
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator->areas_.begin(),
-    tab_iterator->areas_.end(), entry);
-
-  EXPECT_EQ(it, tab_iterator->areas_.begin());
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Prepend(entry.GetPointer());
+
+  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
+    tab_iterator.areas_.end(), entry.GetPointer());
+
+  EXPECT_EQ(it, tab_iterator.areas_.begin());
 }
 
 TEST_F(TestTabIterator, Append)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 10; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Append(entry);
-  nux::InputArea* last = tab_iterator->areas_.back();
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Append(entry.GetPointer());
+  nux::InputArea* last = tab_iterator.areas_.back();
 
-  EXPECT_TRUE(entry == last);  // compare pointers
+  EXPECT_EQ(entry.GetPointer(), last);  // compare pointers
 }
 
 TEST_F(TestTabIterator, InsertIndex)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 10; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Insert(entry, 5);
-
-  std::list<nux::InputArea*>::iterator it = tab_iterator->areas_.begin();
+
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Insert(entry.GetPointer(), 5);
+
+  std::list<nux::InputArea*>::iterator it = tab_iterator.areas_.begin();
   std::advance(it, 5);
 
-  EXPECT_NE(tab_iterator->areas_.end(), it);
-  EXPECT_TRUE(entry == (unity::IMTextEntry*)*it);
+  EXPECT_NE(tab_iterator.areas_.end(), it);
+  EXPECT_EQ(entry.GetPointer(), *it);
 }
 
 TEST_F(TestTabIterator, InsertIndexTooLarge)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 5; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Insert(entry, 7);
-
-  nux::InputArea* last = tab_iterator->areas_.back();
-
-  EXPECT_TRUE(entry == last);  // compare pointers
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Insert(entry.GetPointer(), 7);
+
+  nux::InputArea* last = tab_iterator.areas_.back();
+
+  EXPECT_EQ(entry.GetPointer(), last);  // compare pointers
 }
 
 TEST_F(TestTabIterator, InsertBefore)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(first_entry);
-
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->InsertBefore(second_entry, first_entry);
-
-  EXPECT_TRUE(second_entry == *tab_iterator->areas_.begin());
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.InsertBefore(second_entry.GetPointer(), first_entry.GetPointer());
+
+  EXPECT_EQ(second_entry.GetPointer(), *tab_iterator.areas_.begin());
 }
 
 TEST_F(TestTabIterator, InsertBeforeMissing)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 5; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->InsertBefore(second_entry, first_entry);
-
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator->areas_.begin(),
-    tab_iterator->areas_.end(), second_entry);
-
-  nux::InputArea* last = tab_iterator->areas_.back();
-
-  EXPECT_TRUE(second_entry == last);
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.InsertBefore(second_entry.GetPointer(), first_entry.GetPointer());
+
+  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
+    tab_iterator.areas_.end(), second_entry.GetPointer());
+
+  nux::InputArea* last = tab_iterator.areas_.back();
+
+  EXPECT_EQ(second_entry.GetPointer(), last);
 }
 
 TEST_F(TestTabIterator, InsertAfter)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(first_entry);
-
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->InsertAfter(second_entry, first_entry);
-
-  nux::InputArea* last = tab_iterator->areas_.back();
-
-  EXPECT_TRUE(second_entry == last);
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.InsertAfter(second_entry.GetPointer(), first_entry.GetPointer());
+
+  nux::InputArea* last = tab_iterator.areas_.back();
+
+  EXPECT_EQ(second_entry.GetPointer(), last);
 }
 
 TEST_F(TestTabIterator, InsertAfterMissing)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 5; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->InsertAfter(second_entry, first_entry);
-
-  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator->areas_.begin(),
-    tab_iterator->areas_.end(), second_entry);
-
-  nux::InputArea* last = tab_iterator->areas_.back();
-
-  EXPECT_TRUE(second_entry == last);
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.InsertAfter(second_entry.GetPointer(), first_entry.GetPointer());
+
+  std::list<nux::InputArea*>::iterator it = std::find(tab_iterator.areas_.begin(),
+    tab_iterator.areas_.end(), second_entry.GetPointer());
+
+  nux::InputArea* last = tab_iterator.areas_.back();
+
+  EXPECT_EQ(second_entry.GetPointer(), last);
 }
 
 TEST_F(TestTabIterator, GetDefaultFocus)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 10; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Prepend(entry);
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Prepend(entry.GetPointer());
 
-  EXPECT_TRUE(tab_iterator->DefaultFocus() == entry);
+  EXPECT_EQ(tab_iterator.DefaultFocus(), entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, GetDefaultFocusEmpty)
 {
-  EXPECT_TRUE(tab_iterator->DefaultFocus() == nullptr);
+  EXPECT_EQ(tab_iterator.DefaultFocus(), nullptr);
 }
 
 TEST_F(TestTabIterator, FindKeyFocusAreaFromWindow)
 {
   nux::InputArea* current_focus_area = nux::GetWindowCompositor().GetKeyFocusArea();
   // add the area to the iterator
-  tab_iterator->Prepend(current_focus_area);
+  tab_iterator.Prepend(current_focus_area);
 
-  EXPECT_TRUE(tab_iterator->FindKeyFocusArea(0, 0, 0) == current_focus_area);
+  EXPECT_EQ(tab_iterator.FindKeyFocusArea(0, 0, 0), current_focus_area);
 }
 
 TEST_F(TestTabIterator, FindKeyFocusFromIterator)
 {
+  std::vector<IMTextEntryPtr> local_areas;
+
   for(int index=0; index < 10; ++index)
   {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
   }
 
-  unity::IMTextEntry* entry = new unity::IMTextEntry();
-  tab_iterator->Prepend(entry);
+  auto entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.Prepend(entry.GetPointer());
 
-  EXPECT_TRUE(tab_iterator->FindKeyFocusArea(0, 0, 0) == entry);
+  EXPECT_EQ(tab_iterator.FindKeyFocusArea(0, 0, 0), entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, FindKeyFocusAreaEmpty)
 {
-  EXPECT_TRUE(tab_iterator->FindKeyFocusArea(0, 0, 0) == nullptr);
+  EXPECT_EQ(tab_iterator.FindKeyFocusArea(0, 0, 0), nullptr);
 }
 
 TEST_F(TestTabIterator, KeyNavIterationEmpty)
 {
-  nux::Area* area = tab_iterator->KeyNavIteration(nux::KEY_NAV_TAB_PREVIOUS);
-  EXPECT_TRUE(area == nullptr);
+  nux::Area* area = tab_iterator.KeyNavIteration(nux::KEY_NAV_TAB_PREVIOUS);
+  EXPECT_EQ(area, nullptr);
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWrongDirection)
 {
-  nux::Area* area = tab_iterator->KeyNavIteration(nux::KEY_NAV_NONE);
-  EXPECT_TRUE(area == nullptr);
+  nux::Area* area = tab_iterator.KeyNavIteration(nux::KEY_NAV_NONE);
+  EXPECT_EQ(area, nullptr);
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWithNoCurrentSelectionAndPreviousMove)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
 
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_PREVIOUS);
 
-  EXPECT_TRUE(result == *tab_iterator->areas_.end());
+  EXPECT_EQ(result, *tab_iterator.areas_.rbegin());
+  EXPECT_EQ(result, second_entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, KeyNavIterationNoCurrentSelectionAndNextMove)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
 
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_NEXT);
 
-  EXPECT_TRUE(result == *tab_iterator->areas_.begin());
+  EXPECT_EQ(result, *tab_iterator.areas_.begin());
+  EXPECT_EQ(result, first_entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWithPreviousSelectionIsFirstArea)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
-
-  nux::GetWindowCompositor().SetKeyFocusArea(*tab_iterator->areas_.begin());
-
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
+
+  nux::GetWindowCompositor().SetKeyFocusArea(first_entry.GetPointer());
+
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_PREVIOUS);
 
-  EXPECT_TRUE(result == *tab_iterator->areas_.end());
+  EXPECT_EQ(result, *tab_iterator.areas_.rbegin());
+  EXPECT_EQ(result, second_entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWithPreviousSelectionIsNotFirst)
 {
-  for(int index=0; index < 10; ++index)
-  {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
-  }
-
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
-
-  for(int index=0; index < 10; ++index)
-  {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
-  }
-
-  nux::GetWindowCompositor().SetKeyFocusArea(second_entry);
-
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  std::vector<IMTextEntryPtr> local_areas;
+
+  for(int index=0; index < 10; ++index)
+  {
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
+  }
+
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
+
+  for(int index=0; index < 10; ++index)
+  {
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
+  }
+
+  nux::GetWindowCompositor().SetKeyFocusArea(second_entry.GetPointer());
+
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_PREVIOUS);
-  EXPECT_TRUE(result == first_entry);
+  EXPECT_EQ(result, first_entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWithNextSelectionIsLast)
 {
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* not_in_areas = new unity::IMTextEntry();
-
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
-
-  nux::GetWindowCompositor().SetKeyFocusArea(not_in_areas);
-
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  auto not_in_areas = IMTextEntryPtr(new IMTextEntry);
+
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
+
+  nux::GetWindowCompositor().SetKeyFocusArea(not_in_areas.GetPointer());
+
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_NEXT);
 
-  EXPECT_TRUE(result == *tab_iterator->areas_.begin());
+  EXPECT_EQ(result, *tab_iterator.areas_.begin());
+  EXPECT_EQ(result, first_entry.GetPointer());
 }
 
 TEST_F(TestTabIterator, KeyNavIterationWithNextSelectionIsNotLast)
 {
-  for(int index=0; index < 10; ++index)
-  {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
-  }
-
-  unity::IMTextEntry* first_entry = new unity::IMTextEntry();
-  unity::IMTextEntry* second_entry = new unity::IMTextEntry();
-  tab_iterator->areas_.push_front(second_entry);
-  tab_iterator->areas_.push_front(first_entry);
-
-  for(int index=0; index < 10; ++index)
-  {
-    unity::IMTextEntry* entry = new unity::IMTextEntry();
-    tab_iterator->areas_.push_front(entry);
-  }
-
-  nux::GetWindowCompositor().SetKeyFocusArea(first_entry);
-
-  unity::IMTextEntry* result = (unity::IMTextEntry*) tab_iterator->KeyNavIteration(
+  std::vector<IMTextEntryPtr> local_areas;
+
+  for(int index=0; index < 10; ++index)
+  {
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
+  }
+
+  auto first_entry = IMTextEntryPtr(new IMTextEntry);
+  auto second_entry = IMTextEntryPtr(new IMTextEntry);
+  tab_iterator.areas_.push_back(first_entry.GetPointer());
+  tab_iterator.areas_.push_back(second_entry.GetPointer());
+
+  for(int index=0; index < 10; ++index)
+  {
+    local_areas.push_back(IMTextEntryPtr(new IMTextEntry));
+    tab_iterator.areas_.push_back(local_areas.back().GetPointer());
+  }
+  nux::GetWindowCompositor().SetKeyFocusArea(first_entry.GetPointer());
+
+  IMTextEntry* result = (IMTextEntry*) tab_iterator.KeyNavIteration(
     nux::KEY_NAV_TAB_NEXT);
-  EXPECT_TRUE(result == second_entry);
+  EXPECT_EQ(result, second_entry.GetPointer());
 }
 
 } // previews
 
=== modified file 'tests/test_time_util.cpp'
--- tests/test_time_util.cpp	2012-12-01 03:51:10 +0000
+++ tests/test_time_util.cpp	2013-07-18 23:02:25 +0000
@@ -26,7 +26,7 @@
 
 TEST(TestTimeUtil, Testin32BufferOverflow)
 {
-  struct timespec start, end;
+  struct timespec start {0, 0}, end {0, 0};
   unity::TimeUtil::SetTimeStruct(&start, &end);
 
   end.tv_sec = start.tv_sec + INT32_MAX;
 
=== modified file 'tests/test_xdnd_manager_imp.cpp'
--- tests/test_xdnd_manager_imp.cpp	2012-11-20 13:11:53 +0000
+++ tests/test_xdnd_manager_imp.cpp	2013-07-18 23:02:25 +0000
@@ -59,6 +59,7 @@
     xevent.type = ClientMessage;
     xevent.xany.display = nux::GetGraphicsDisplay()->GetX11Display();
     xevent.xclient.message_type = XInternAtom(xevent.xany.display, "XdndEnter", false);
+    xevent.xclient.format = 0;
     xevent.xclient.data.l[1] = 5 >> 24;
 
     nux::GetGraphicsDisplay()->ProcessXEvent(xevent, true);
 
=== modified file 'unity-shared/PlacesOverlayVScrollBar.cpp'
--- unity-shared/PlacesOverlayVScrollBar.cpp	2013-04-02 23:38:31 +0000
+++ unity-shared/PlacesOverlayVScrollBar.cpp	2013-07-18 23:02:25 +0000
@@ -91,7 +91,7 @@
 
 void PlacesOverlayVScrollBar::SetupAnimation(int start, int stop, int milliseconds)
 {
-  tweening_connection_.disconnect();
+  tweening_connection_->disconnect();
   delta_update_ = 0;
 
   animation_.SetDuration(milliseconds);
 
=== modified file 'unity-shared/PlacesOverlayVScrollBar.h'
--- unity-shared/PlacesOverlayVScrollBar.h	2012-12-13 14:26:56 +0000
+++ unity-shared/PlacesOverlayVScrollBar.h	2013-07-18 23:02:25 +0000
@@ -23,6 +23,7 @@
 #include <Nux/Nux.h>
 #include <Nux/InputAreaProximity.h>
 #include <NuxCore/Animation.h>
+#include <UnityCore/ConnectionManager.h>
 #include <memory>
 
 #include "unity-shared/PlacesVScrollBar.h"
@@ -94,7 +95,7 @@
   nux::InputAreaProximity area_prox_;
 
   nux::animation::AnimateValue<int> animation_;
-  sigc::connection tweening_connection_;
+  connection::Wrapper tweening_connection_;
 
   nux::ObjectPtr<nux::BaseTexture> connector_texture_;