Unity

Merge lp:~loic.molinari/unity/unity-sigc-trackable-base-class into lp:unity

  1. unity-sigc-trackable-base-class
  2. Merge into trunk
Proposed by Loïc Molinari
Status: Merged
Merged at revision: 813
Proposed branch: lp:~loic.molinari/unity/unity-sigc-trackable-base-class
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
src/LauncherIcon.h (+1/-1)
To merge this branch: bzr merge lp:~loic.molinari/unity/unity-sigc-trackable-base-class
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+47781@code.launchpad.net

Description of the change

This branch adapts Unity to lp:~loic.molinari/nux/nux-sigc-trackable-base-class which makes nux::Trackable inherit from sigc::trackable and adds the OnDestroyed signal in nux::Trackable.

Fixes lp:703054 and invalidates lp:706891.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/LauncherIcon.h'
2--- src/LauncherIcon.h 2011-01-24 21:45:08 +0000
3+++ src/LauncherIcon.h 2011-01-28 10:22:55 +0000
4@@ -43,7 +43,7 @@
5 class QuicklistView;
6
7
8-class LauncherIcon : public Introspectable, public nux::InitiallyUnownedObject, public sigc::trackable
9+class LauncherIcon : public Introspectable, public nux::InitiallyUnownedObject
10 {
11 NUX_DECLARE_OBJECT_TYPE (LauncherIcon, nux::InitiallyUnownedObject);
12 public: