Merge lp:~agateau/unity-2d/maverick-libunity2d into lp:unity-2d/0.4

[Aurélien Gâteau]

[backend] Introduce libunity-2d

- Introduce libunity-2d, which contains most of libuqpanel.
- Get rid of libuqpanel. Most of it is in libunity-2d, only a few classes went into unity-2d-panel
- Remove dead code from UnityPlaces.
- Introduce libunity-2d-qml, which contains a few C++ classes implementing QML objects. These classes comes from UnityPlaces.

This first merge request does the following things:

- Introduce libunity-2d, which contains most of libuqpanel.
- Get rid of libuqpanel. Most of it is in libunity-2d, only a few classes went into unity-2d-panel
- Remove dead code from UnityPlaces.
- Introduce libunity-2d-qml, which contains a few C++ classes implementing QML objects. These classes comes from UnityPlaces.

Next step is to move the C++ classes from UnityLauncher into libunity-2d-qml.

I hesitated a bit on the library names (libunity-2d vs libUnity2d and libunity-2d-qml vs libUnity2dQml) but went for the "hyphen" version to be consistent with the names of the other unity-2d components. I am happy to rename them if you think using capitalized letters is better (to be consistent with Qt{Dee,Bamf,GConf})

[Florian Boucault (fboucault)]

kaleo@tequila:~/Projects/upicek/unity-2d$ grep -r UnityPlaces *
spread/app/spread.cpp: /* Spread.qml imports UnityPlaces, which is part of the places

UnityPlaces should not appear anymore, Unity2d replaces it.

review: Needs Fixing

[Florian Boucault (fboucault)]

Why adding X11 to the root CMakeLists.txt?

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-01-14 20:42:44 +0000
+++ CMakeLists.txt 2011-01-27 15:12:29 +0000
@@ -13,6 +13,7 @@
 # Dependencies
 include(FindPkgConfig)
 find_package(Qt4 REQUIRED)
+find_package(X11 REQUIRED)

 include_directories(
     ${CMAKE_BINARY_DIR}
@@ -22,9 +23,11 @@
     ${QT_QTDECLARATIVE_INCLUDE_DIR}
     ${QT_QTXML_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
     )

[Florian Boucault (fboucault)]

kaleo@tequila:~/Projects/upicek/unity-2d$ grep -r -i uqp *

panel/applets/legacytray/legacytrayapplet.cpp:// uqpanel
panel/applets/legacytray/fdotask.cpp:// uqpanel
panel/app/unity2dstyle.cpp:// uqpanel

[Florian Boucault (fboucault)]

kaleo@tequila:~/tmp/unity-2d$ grep -r -i uqa .

./panel/applets/CMakeLists.txt:project(uqapplets)
./panel/applets/CMakeLists.txt:set(uqapplets_SRCS
./panel/applets/CMakeLists.txt:qt4_add_dbus_adaptor(uqapplets_SRCS appname/org.ayatana.AppMenu.Registrar.xml
./panel/applets/CMakeLists.txt:qt4_automoc(${uqapplets_SRCS})
./panel/applets/CMakeLists.txt:add_library(uqapplets ${uqapplets_SRCS})
./panel/applets/CMakeLists.txt:target_link_libraries(uqapplets
./panel/app/CMakeLists.txt: ${uqapplets_SOURCE_DIR}
./panel/app/CMakeLists.txt: ${uqapplets_SOURCE_DIR}/common
./panel/app/CMakeLists.txt: uqapplets
./panel/tests/CMakeLists.txt: uqapplets
./panel/tests/CMakeLists.txt: ${uqapplets_SOURCE_DIR}/homebutton
./panel/tests/CMakeLists.txt: ${uqapplets_SOURCE_DIR}/common

review: Needs Fixing

[Aurélien Gâteau (agateau)]

> kaleo@tequila:~/Projects/upicek/unity-2d$ grep -r UnityPlaces *
> spread/app/spread.cpp: /* Spread.qml imports UnityPlaces, which is part
> of the places
>
> UnityPlaces should not appear anymore, Unity2d replaces it.

Fixed.

> Why adding X11 to the root CMakeLists.txt?

Because we are using it in so many places I thought it would be smarter to test for it globally, like Qt4. We can remove the individual tests later.

[lp:~agateau/unity-2d/maverick-libunity2d]

386. By Aurélien Gâteau on 2011-01-27

Fix running in !isRunningInstalled() mode

[Florian Boucault (fboucault)]

in debian/control

I think Package: libuqpanel0 and Package: libuqpanel-dev should be kept but become dummy transitional packages exactly like it was done for unity-qt-* packages.

Package: libuqpanel0
Architecture: any
Depends: ${misc:Depends}, libunity-2d0
Description: dummy transitional package for unity-2d-panel
 This transitional package helps users transition to the
 libunity-2d0 package. Once this package and its dependencies
 are installed you can safely remove it.

Thoughts?

[Florian Boucault (fboucault)]

The !isRunningInstalled mode for the dash/places is broken too.

[Aurélien Gâteau (agateau)]

> kaleo@tequila:~/tmp/unity-2d$ grep -r -i uqa .
>
> ./panel/applets/CMakeLists.txt:project(uqapplets)

uqapplets still exists. It is a static library. Renaming it can be done in a separate MR.

[Aurélien Gâteau (agateau)]

> kaleo@tequila:~/Projects/upicek/unity-2d$ grep -r -i uqp *
>
> panel/applets/legacytray/legacytrayapplet.cpp:// uqpanel
> panel/applets/legacytray/fdotask.cpp:// uqpanel
> panel/app/unity2dstyle.cpp:// uqpanel

Fixed

[lp:~agateau/unity-2d/maverick-libunity2d]

387. By Aurélien Gâteau on 2011-01-27

uqpanel => libunity-2d, even in comments!

[Aurélien Gâteau (agateau)]

> in debian/control
>
> I think Package: libuqpanel0 and Package: libuqpanel-dev should be kept but
> become dummy transitional packages exactly like it was done for unity-qt-*
> packages.
>
> Package: libuqpanel0
> Architecture: any
> Depends: ${misc:Depends}, libunity-2d0
> Description: dummy transitional package for unity-2d-panel
> This transitional package helps users transition to the
> libunity-2d0 package. Once this package and its dependencies
> are installed you can safely remove it.
>
> Thoughts?

Fixed

[Aurélien Gâteau (agateau)]

> The !isRunningInstalled mode for the dash/places is broken too.

Screw !isRunningInstalled!, but fixed nevertheless

[lp:~agateau/unity-2d/maverick-libunity2d]

388. By Aurélien Gâteau on 2011-01-27

Use transitional packages to install libunity-2d

389. By Aurélien Gâteau on 2011-01-27

Fix !isRunningInstalled mode

[Florian Boucault (fboucault)]

Is libunity-2d needing a .pc file (similar to what was done for panel/lib/libuqpanel.pc.in)?

[Florian Boucault (fboucault)]

debian/libuqpanel0.postrm was deleted and no debian/libunity-2d0.postrm was created, is that intended?

[Aurélien Gâteau (agateau)]

> Is libunity-2d needing a .pc file (similar to what was done for
> panel/lib/libuqpanel.pc.in)?

I don't think we need one, unless we expect 3rd-party developers to use libunity-2d

[Florian Boucault (fboucault)]

No .symbols is present for libunity-2d (similar to debian/libuqpanel0.symbols), is that intended?

[Florian Boucault (fboucault)]

kaleo@tequila:~/tmp/unity-2d$ grep -r panel.h *

panel/applets/common/applet.cpp:#include <panel.h>

review: Needs Fixing

[Aurélien Gâteau (agateau)]

> No .symbols is present for libunity-2d (similar to
> debian/libuqpanel0.symbols), is that intended?

I don't know how to generate a .symbols. That is a packager job (why oh why don't we use separate packaging branches?)

[Florian Boucault (fboucault)]

kaleo@tequila:~/tmp/unity-2d$ make check

fails with

make[3]: *** No rule to make target `launcher_check', needed by `panel/CMakeFiles/check'. Stop.
make[2]: *** [panel/CMakeFiles/check.dir/all] Error 2
make[1]: *** [panel/CMakeFiles/check.dir/rule] Error 2
make: *** [check] Error 2

review: Needs Fixing

[lp:~agateau/unity-2d/maverick-libunity2d]

390. By Aurélien Gâteau on 2011-01-27

Added missing postrm file

391. By Aurélien Gâteau on 2011-01-27

Removed a bunch of unused includes

[Aurélien Gâteau (agateau)]

> kaleo@tequila:~/tmp/unity-2d$ grep -r panel.h *
>
> panel/applets/common/applet.cpp:#include <panel.h>

Wow, good catch. Don't you like including ncurses panel.h?
Fixed (and removed a bunch of other unused #include)

[Aurélien Gâteau (agateau)]

> debian/libuqpanel0.postrm was deleted and no debian/libunity-2d0.postrm was
> created, is that intended?

Fixed

[Olivier Tilloy (osomon)]

When running the places uninstalled:

$ ./places/app/unity-2d-places
file:///home/osomon/dev/unity-2d/maverick-libunity2d//places/dash.qml:60:5: Type GnomeBackground unavailable
             overlay_color: "black"
         ^
file:///home/osomon/dev/unity-2d/maverick-libunity2d//places/GnomeBackground.qml:4:1: module "Unity2d" is not installed
     import Unity2d 1.0
     ^

review: Needs Fixing (functional)

[Aurélien Gâteau (agateau)]

> When running the places uninstalled:
>
> $ ./places/app/unity-2d-places
> file:///home/osomon/dev/unity-2d/maverick-libunity2d//places/dash.qml:60:5:
> Type GnomeBackground unavailable
> overlay_color: "black"
> ^
> file:///home/osomon/dev/unity-2d/maverick-
> libunity2d//places/GnomeBackground.qml:4:1: module "Unity2d" is not installed
> import Unity2d 1.0
> ^

Isn't that fixed with r389?

[Florian Boucault (fboucault)]

debian/control:

libunity-2d0 and libunity-2d-dev should have a versioned Conflicts and Replaces as well as aProvides on libuqpanel*

See Package: unity-2d-panel as an example

review: Needs Fixing

[Aurélien Gâteau (agateau)]

> kaleo@tequila:~/tmp/unity-2d$ make check
>
> fails with
>
>
> make[3]: *** No rule to make target `launcher_check', needed by
> `panel/CMakeFiles/check'. Stop.
> make[2]: *** [panel/CMakeFiles/check.dir/all] Error 2
> make[1]: *** [panel/CMakeFiles/check.dir/rule] Error 2
> make: *** [check] Error 2

Fixed

[lp:~agateau/unity-2d/maverick-libunity2d]

392. By Aurélien Gâteau on 2011-01-27

Unbreak "make check"

[Florian Boucault (fboucault)]

> > No .symbols is present for libunity-2d (similar to
> > debian/libuqpanel0.symbols), is that intended?
>
> I don't know how to generate a .symbols. That is a packager job (why oh why
> don't we use separate packaging branches?)

Because *we* maintain a daily PPA for our users/testers.

I will take care of the .symbols.

[lp:~agateau/unity-2d/maverick-libunity2d]

393. By Aurélien Gâteau on 2011-01-27

Updated ignore for debian dir

394. By Aurélien Gâteau on 2011-01-27

Ignore libunity-2d files

395. By Aurélien Gâteau on 2011-01-27

Renamed qml to Unity2d so that !isRunningInstalled works

[Olivier Tilloy (osomon)]

At revision 395 of this branch, I successfully built packages in a chroot and installed them on my system. I did some quick functional testing of all the components, and I couldn’t observe any obvious regression.

This validates the upgrade path, but the system used isn’t exacly clean, it’s my development environment…
A really complete review should also test installation of those packages on a bare install of maverick.

Note that this is a functional review only, I didn’t look at the actual changeset, Florian is taking care of that.

review: Approve (functional)

[Florian Boucault (fboucault)]

Last code bits to fix:
- generating .symbols files for libunity-2d
- reviewing commit 395

[Florian Boucault (fboucault)]

Commit 395 is fine.
Symbols file has been added. See https://wiki.ubuntu.com/stefanlsd/dpkg-gensymbols for a nice documentation.

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2011-01-14 20:42:44 +0000
+++ .bzrignore	2011-01-27 16:58:50 +0000
@@ -17,9 +17,12 @@
 panel/app/unity-2d-panel
 panel/applets/registraradaptor.*
 panel/lib/libuqpanel.so*
-panel/tests/paneltest
 panel/tests/homebuttonapplettest
 
+libunity-2d/src/libunity-2d.so.*
+libunity-2d/tests/keyboardmodifiersmonitortest
+libunity-2d/tests/paneltest
+
 # Cmake files and generated files
 Makefile
 .bzr-repo
@@ -42,9 +45,16 @@
 debian/*.substvars
 debian/*.debhelper
 debian/stamp-*
-debian/libuqpanel-dev
-debian/libuqpanel0
 debian/tmp
 debian/unity-2d-launcher
 debian/unity-2d-panel
 debian/unity-2d-places
+debian/unity-2d-spread
+debian/libunity-2d-dev
+debian/libunity-2d0
+debian/unity-qt-launcher
+debian/unity-qt-panel
+debian/unity-qt-places
+debian/unity-qt-spread
+debian/libuqpanel-dev
+debian/libuqpanel0

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-01-14 20:42:44 +0000
+++ CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -13,6 +13,7 @@
 # Dependencies
 include(FindPkgConfig)
 find_package(Qt4 REQUIRED)
+find_package(X11 REQUIRED)
 
 include_directories(
     ${CMAKE_BINARY_DIR}
@@ -22,9 +23,14 @@
     ${QT_QTDECLARATIVE_INCLUDE_DIR}
     ${QT_QTXML_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}
+    ${X11_INCLUDE_DIR}
     )
 
+# Tests
+add_custom_target(check)
+
 # Source
+add_subdirectory(libunity-2d)
 add_subdirectory(launcher)
 add_subdirectory(panel)
 add_subdirectory(places)

=== modified file 'debian/control'
--- debian/control	2011-01-19 20:36:35 +0000
+++ debian/control	2011-01-27 16:58:50 +0000
@@ -10,6 +10,22 @@
                libx11-dev, libindicator-dev, libgtk2.0-dev
 Standards-Version: 3.9.1
 
+Package: libunity-2d0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Unity 2D shared library
+ This library is used to host common code used by several Unity 2D components
+
+Package: libunity-2d-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d0 (= ${binary:Version})
+Description: Unity 2D shared library - development files
+ This library is used to host common code used by several Unity 2D components
+ .
+ This package contains the development header files.
+
 Package: unity-2d-launcher
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-asset-pool
@@ -34,29 +50,9 @@
  various indicators. It part of Unity 2D and can not run  as a standalone
  application outside of the Unity 2D environment.
 
-Package: libuqpanel0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Unity 2D Panel - shared library
- This library is used to create panel applets for the Unity 2D panel and
- provides various support functions for Unity 2D. It is only needed as
- part of a Unity 2D installation
-
-Package: libuqpanel-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libuqpanel0 (= ${binary:Version})
-Description: Unity 2D Panel - development files
- This library is used to create panel applets for the Unity 2D panel and
- provides various support functions for Unity 2D. It is only needed as part
- of a Unity 2D installation.
- .
- This package contains the development header files.
-
 Package: unity-2d-places
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher
+Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d0
 Provides: unity-qt-places
 Conflicts: unity-qt-places (<= 0.2)
 Replaces: unity-qt-places (<= 0.2)
@@ -67,7 +63,7 @@
 
 Package: unity-2d-spread
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, unity-2d-places
+Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d0
 Provides: unity-qt-spread
 Conflicts: unity-qt-spread (<= 0.2)
 Replaces: unity-qt-spread (<= 0.2)
@@ -108,3 +104,20 @@
  This transitional package helps users transition to the
  unity-2d-spread package.  Once this package and its dependencies
  are installed you can safely remove it.
+
+Package: libuqpanel0
+Architecture: any
+Depends: ${misc:Depends}, libunity-2d0
+Description: dummy transitional package for libuqpanel0
+ This transitional package helps users transition to the
+ libunity-2d0 package.  Once this package and its dependencies
+ are installed you can safely remove it.
+
+Package: libuqpanel-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libunity-2d-dev
+Description: dummy transitional package for libuqpanel-dev
+ This transitional package helps users transition to the
+ libunity-2d-dev package.  Once this package and its dependencies
+ are installed you can safely remove it.

=== added file 'debian/libunity-2d-dev.install'
--- debian/libunity-2d-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libunity-2d-dev.install	2011-01-27 16:58:50 +0000
@@ -0,0 +1,2 @@
+usr/lib/libunity-2d.so
+usr/include/unity-2d

=== added file 'debian/libunity-2d0.install'
--- debian/libunity-2d0.install	1970-01-01 00:00:00 +0000
+++ debian/libunity-2d0.install	2011-01-27 16:58:50 +0000
@@ -0,0 +1,3 @@
+usr/lib/libunity-2d.so.*
+usr/lib/qt4/imports/Unity2d/libunity-2d-qml.so
+usr/lib/qt4/imports/Unity2d/qmldir

=== added file 'debian/libunity-2d0.postinst'
--- debian/libunity-2d0.postinst	1970-01-01 00:00:00 +0000
+++ debian/libunity-2d0.postinst	2011-01-27 16:58:50 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#

=== added file 'debian/libunity-2d0.postrm'
--- debian/libunity-2d0.postrm	1970-01-01 00:00:00 +0000
+++ debian/libunity-2d0.postrm	2011-01-27 16:58:50 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ "$1" = "remove" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#

=== removed file 'debian/libuqpanel-dev.install'
--- debian/libuqpanel-dev.install	2010-12-08 21:21:16 +0000
+++ debian/libuqpanel-dev.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/lib/libuqpanel.so
-usr/lib/pkgconfig/libuqpanel.pc
-usr/include/uqpanel
-

=== removed file 'debian/libuqpanel0.install'
--- debian/libuqpanel0.install	2010-12-08 21:21:16 +0000
+++ debian/libuqpanel0.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/libuqpanel.so.*
-

=== removed file 'debian/libuqpanel0.postinst'
--- debian/libuqpanel0.postinst	2011-01-14 22:05:40 +0000
+++ debian/libuqpanel0.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#

=== removed file 'debian/libuqpanel0.postrm'
--- debian/libuqpanel0.postrm	2011-01-14 22:05:40 +0000
+++ debian/libuqpanel0.postrm	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#

=== removed file 'debian/libuqpanel0.symbols'
--- debian/libuqpanel0.symbols	2011-01-18 12:41:29 +0000
+++ debian/libuqpanel0.symbols	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# SymbolsHelper-Confirmed: 0.1 i386
-libuqpanel.so.0 libuqpanel0 #MINVER#
- _ZN12Unity2dStyleC1Ev@Base 0.1
- _ZN12Unity2dStyleC2Ev@Base 0.1
- _ZN12Unity2dStyleD0Ev@Base 0.1
- _ZN12Unity2dStyleD1Ev@Base 0.1
- _ZN18Unity2dApplication11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
- _ZN18Unity2dApplication11qt_metacastEPKc@Base 0.1
- _ZN18Unity2dApplication14x11EventFilterEP7_XEvent@Base 0.1
- _ZN18Unity2dApplication16staticMetaObjectE@Base 0.1
- _ZN18Unity2dApplication20removeX11EventFilterEP22AbstractX11EventFilter@Base 0.1
- _ZN18Unity2dApplication21installX11EventFilterEP22AbstractX11EventFilter@Base 0.1
- _ZN18Unity2dApplication8instanceEv@Base 0.1
- _ZN18Unity2dApplicationC1ERiPPc@Base 0.1
- _ZN18Unity2dApplicationC2ERiPPc@Base 0.1
- _ZN18Unity2dApplicationD0Ev@Base 0.1
- _ZN18Unity2dApplicationD1Ev@Base 0.1
- _ZN22AbstractX11EventFilterD0Ev@Base 0.1
- _ZN22AbstractX11EventFilterD1Ev@Base 0.1
- _ZN22AbstractX11EventFilterD2Ev@Base 0.1
- _ZN24KeyboardModifiersMonitor11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
- _ZN24KeyboardModifiersMonitor11qt_metacastEPKc@Base 0.1
- _ZN24KeyboardModifiersMonitor14x11EventFilterEP7_XEvent@Base 0.1
- _ZN24KeyboardModifiersMonitor16staticMetaObjectE@Base 0.1
- _ZN24KeyboardModifiersMonitor24keyboardModifiersChangedE6QFlagsIN2Qt16KeyboardModifierEE@Base 0.1
- _ZN24KeyboardModifiersMonitor8instanceEv@Base 0.1
- _ZN24KeyboardModifiersMonitorC1EP7QObject@Base 0.1
- _ZN24KeyboardModifiersMonitorC2EP7QObject@Base 0.1
- _ZN24KeyboardModifiersMonitorD0Ev@Base 0.1
- _ZN24KeyboardModifiersMonitorD1Ev@Base 0.1
- _ZN24KeyboardModifiersMonitorD2Ev@Base 0.1
- (optional=templinst)_ZN5QListIP22AbstractX11EventFilterE13detach_helperEi@Base 0.1
- (optional=templinst)_ZN5QListIP22AbstractX11EventFilterE6appendERKS1_@Base 0.1
- (optional=templinst)_ZN5QListIP22AbstractX11EventFilterED1Ev@Base 0.1
- _ZN7Unity2d5Panel10paintEventEP11QPaintEvent@Base 0.1
- _ZN7Unity2d5Panel11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
- _ZN7Unity2d5Panel11qt_metacastEPKc@Base 0.1
- _ZN7Unity2d5Panel15workAreaResizedEi@Base 0.1
- _ZN7Unity2d5Panel16staticMetaObjectE@Base 0.1
- _ZN7Unity2d5Panel7setEdgeENS0_4EdgeE@Base 0.1
- _ZN7Unity2d5Panel9addSpacerEv@Base 0.1
- _ZN7Unity2d5Panel9addWidgetEP7QWidget@Base 0.1
- _ZN7Unity2d5Panel9showEventEP10QShowEvent@Base 0.1
- _ZN7Unity2d5PanelC1EP7QWidget@Base 0.1
- _ZN7Unity2d5PanelC2EP7QWidget@Base 0.1
- _ZN7Unity2d5PanelD0Ev@Base 0.1
- _ZN7Unity2d5PanelD1Ev@Base 0.1
- _ZN7Unity2d5PanelD2Ev@Base 0.1
- _ZN7Unity2d6Applet11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.1
- _ZN7Unity2d6Applet11qt_metacastEPKc@Base 0.1
- _ZN7Unity2d6Applet16staticMetaObjectE@Base 0.1
- _ZN7Unity2d6AppletC1Ev@Base 0.1
- _ZN7Unity2d6AppletC2Ev@Base 0.1
- _ZN7Unity2d6AppletD0Ev@Base 0.1
- _ZN7Unity2d6AppletD1Ev@Base 0.1
- _ZN7Unity2d6AppletD2Ev@Base 0.1
- _ZNK12Unity2dStyle11drawControlEN6QStyle14ControlElementEPK12QStyleOptionP8QPainterPK7QWidget@Base 0.1
- _ZNK12Unity2dStyle11pixelMetricEN6QStyle11PixelMetricEPK12QStyleOptionPK7QWidget@Base 0.1
- _ZNK12Unity2dStyle16sizeFromContentsEN6QStyle12ContentsTypeEPK12QStyleOptionRK5QSizePK7QWidget@Base 0.1
- _ZNK12Unity2dStyle9styleHintEN6QStyle9StyleHintEPK12QStyleOptionPK7QWidgetP16QStyleHintReturn@Base 0.1
- _ZNK18Unity2dApplication10metaObjectEv@Base 0.1
- _ZNK24KeyboardModifiersMonitor10metaObjectEv@Base 0.1
- _ZNK24KeyboardModifiersMonitor17keyboardModifiersEv@Base 0.1
- _ZNK7Unity2d5Panel10metaObjectEv@Base 0.1
- _ZNK7Unity2d5Panel4edgeEv@Base 0.1
- _ZNK7Unity2d6Applet10metaObjectEv@Base 0.1
- _ZTI12Unity2dStyle@Base 0.1
- _ZTI18Unity2dApplication@Base 0.1
- _ZTI22AbstractX11EventFilter@Base 0.1
- _ZTI24KeyboardModifiersMonitor@Base 0.1
- _ZTIN7Unity2d5PanelE@Base 0.1
- _ZTIN7Unity2d6AppletE@Base 0.1
- _ZTS12Unity2dStyle@Base 0.1
- _ZTS18Unity2dApplication@Base 0.1
- _ZTS22AbstractX11EventFilter@Base 0.1
- _ZTS24KeyboardModifiersMonitor@Base 0.1
- _ZTSN7Unity2d5PanelE@Base 0.1
- _ZTSN7Unity2d6AppletE@Base 0.1
- _ZTV12Unity2dStyle@Base 0.1
- _ZTV18Unity2dApplication@Base 0.1
- _ZTV22AbstractX11EventFilter@Base 0.1
- _ZTV24KeyboardModifiersMonitor@Base 0.1
- _ZTVN7Unity2d5PanelE@Base 0.1
- _ZTVN7Unity2d6AppletE@Base 0.1
- (c++)"non-virtual thunk to KeyboardModifiersMonitor::x11EventFilter(_XEvent*)@Base" 0.1
- (c++)"non-virtual thunk to KeyboardModifiersMonitor::~KeyboardModifiersMonitor()@Base" 0.1
- (c++)"non-virtual thunk to Unity2d::Applet::~Applet()@Base" 0.1
- (c++)"non-virtual thunk to Unity2d::Panel::~Panel()@Base" 0.1

=== modified file 'debian/unity-2d-places.install'
--- debian/unity-2d-places.install	2011-01-14 21:41:39 +0000
+++ debian/unity-2d-places.install	2011-01-27 16:58:50 +0000
@@ -4,8 +4,3 @@
 usr/share/unity-2d/places/*.qml
 usr/share/unity-2d/places/utils.js
 usr/share/unity-2d/places/artwork
-usr/lib/qt4/imports/UnityPlaces/libUnityPlaces.so.1.0.0
-usr/lib/qt4/imports/UnityPlaces/libUnityPlaces.so.1
-usr/lib/qt4/imports/UnityPlaces/libUnityPlaces.so
-usr/lib/qt4/imports/UnityPlaces/qmldir
-

=== modified file 'launcher/tests/CMakeLists.txt'
--- launcher/tests/CMakeLists.txt	2010-12-08 15:00:32 +0000
+++ launcher/tests/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -14,6 +14,7 @@
 
     add_custom_target(launcher_check COMMAND ${CMAKE_CTEST_COMMAND} --verbose
         DEPENDS ${_test_list})
+    add_dependencies(check launcher_check)
 endmacro(launcher_tests)
 
 include_directories(

=== added directory 'libunity-2d'
=== added file 'libunity-2d/CMakeLists.txt'
--- libunity-2d/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libunity-2d/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -0,0 +1,8 @@
+project(libunity-2d)
+
+set(libunity-2d_SOVERSION 0)
+set(libunity-2d_VERSION ${libunity-2d_SOVERSION}.0.0)
+
+add_subdirectory(src)
+add_subdirectory(Unity2d)
+add_subdirectory(tests)

=== added directory 'libunity-2d/Unity2d'
=== renamed file 'places/UnityPlaces/CMakeLists.txt' => 'libunity-2d/Unity2d/CMakeLists.txt'
--- places/UnityPlaces/CMakeLists.txt	2011-01-20 03:46:43 +0000
+++ libunity-2d/Unity2d/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -1,15 +1,10 @@
-cmake_minimum_required(VERSION 2.8)
+# Dependencies
 pkg_check_modules(WNCK REQUIRED libwnck-1.0)
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 
-# Dependencies
-include(FindPkgConfig)
-find_package(Qt4 REQUIRED)
-
 # Sources
-set(UnityPlaces_SRCS
+set(unity-2d-qml_SRCS
     plugin.cpp
-    qdbusconnectionqml.cpp
     qsortfilterproxymodelqml.cpp
     blendedimageprovider.cpp
     windowimageprovider.cpp
@@ -18,37 +13,26 @@
     cacheeffect.cpp
     )
 
-set(UnityPlaces_MOC_HDRS
-    unity_place.h
-    unity_place_entry.h
+set(unity-2d-qml_MOC_HDRS
     plugin.h
-    qdbusconnectionqml.h
     qsortfilterproxymodelqml.h
-    blendedimageprovider.h
-    windowimageprovider.h
     windowinfo.h
     windowslist.h
-    cacheeffect.h
     )
 
-qt4_wrap_cpp(UnityPlaces_MOC_SRCS ${UnityPlaces_MOC_HDRS})
+qt4_wrap_cpp(unity-2d-qml_MOC_SRCS ${unity-2d-qml_MOC_HDRS})
 
 # Build
-add_library(UnityPlaces SHARED ${UnityPlaces_SRCS} ${UnityPlaces_MOC_SRCS})
+add_library(unity-2d-qml SHARED ${unity-2d-qml_SRCS} ${unity-2d-qml_MOC_SRCS})
 add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE)
 
-set_target_properties(UnityPlaces PROPERTIES
-    SOVERSION 1
-    VERSION 1.0.0
-    )
-
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${WNCK_INCLUDE_DIRS}
     ${QTBAMF_INCLUDE_DIRS}
     )
 
-target_link_libraries(UnityPlaces
+target_link_libraries(unity-2d-qml
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTDECLARATIVE_LIBRARIES}
@@ -57,9 +41,9 @@
     )
 
 # Install
-set(IMPORT_INSTALL_DIR lib/qt4/imports/UnityPlaces)
+set(IMPORT_INSTALL_DIR lib/qt4/imports/Unity2d)
 
-install(TARGETS UnityPlaces
+install(TARGETS unity-2d-qml
     LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
     )
 

=== renamed file 'places/UnityPlaces/blendedimageprovider.cpp' => 'libunity-2d/Unity2d/blendedimageprovider.cpp'
=== renamed file 'places/UnityPlaces/blendedimageprovider.h' => 'libunity-2d/Unity2d/blendedimageprovider.h'
=== renamed file 'places/UnityPlaces/cacheeffect.cpp' => 'libunity-2d/Unity2d/cacheeffect.cpp'
=== renamed file 'places/UnityPlaces/cacheeffect.h' => 'libunity-2d/Unity2d/cacheeffect.h'
=== renamed file 'places/UnityPlaces/plugin.cpp' => 'libunity-2d/Unity2d/plugin.cpp'
--- places/UnityPlaces/plugin.cpp	2011-01-20 03:46:43 +0000
+++ libunity-2d/Unity2d/plugin.cpp	2011-01-27 16:58:50 +0000
@@ -20,33 +20,28 @@
 /* Required otherwise using wnck_set_client_type breaks linking with error:
    undefined reference to `wnck_set_client_type(WnckClientType)'
 */
-extern "C" {
-#include <libwnck/util.h>
-}
+#include "plugin.h"
 
-#include "unity_place.h"
-#include "unity_place_entry.h"
+#include "blendedimageprovider.h"
+#include "cacheeffect.h"
 #include "qsortfilterproxymodelqml.h"
-#include "blendedimageprovider.h"
-
-#include <QtDeclarative/qdeclarative.h>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-#include <QDesktopWidget>
-#include <QApplication>
-
 #include "windowimageprovider.h"
 #include "windowinfo.h"
 #include "windowslist.h"
-#include "plugin.h"
-#include "cacheeffect.h"
-
-
-
-void UnityPlacesPlugin::registerTypes(const char *uri)
+
+#include <QApplication>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDesktopWidget>
+#include <QtDeclarative/qdeclarative.h>
+
+#undef signals
+extern "C" {
+#include <libwnck/util.h>
+}
+
+void Unity2dPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<UnityPlace>(uri, 0, 1, "UnityPlace");
-    qmlRegisterType<UnityPlaceEntry>(uri, 0, 1, "UnityPlaceEntry");
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "QSortFilterProxyModelQML");
 
     qmlRegisterType<WindowInfo>(uri, 0, 1, "WindowInfo");
@@ -54,7 +49,7 @@
     qmlRegisterType<CacheEffect>(uri, 0, 1, "CacheEffect");
 }
 
-void UnityPlacesPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
+void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
 {
     Q_UNUSED(uri);
 
@@ -80,4 +75,4 @@
     wnck_set_client_type(WNCK_CLIENT_TYPE_PAGER);
 }
 
-Q_EXPORT_PLUGIN2(UnityPlaces, UnityPlacesPlugin);
+Q_EXPORT_PLUGIN2(Unity2d, Unity2dPlugin);

=== renamed file 'places/UnityPlaces/plugin.h' => 'libunity-2d/Unity2d/plugin.h'
--- places/UnityPlaces/plugin.h	2010-10-14 01:57:24 +0000
+++ libunity-2d/Unity2d/plugin.h	2011-01-27 16:58:50 +0000
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UNITYPLACESPLUGIN_H
-#define UNITYPLACESPLUGIN_H
+#ifndef UNITY2DPLUGIN_H
+#define UNITY2DPLUGIN_H
 
 #include <QtDeclarative/QDeclarativeExtensionPlugin>
 
-class UnityPlacesPlugin : public QDeclarativeExtensionPlugin
+class Unity2dPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -31,4 +31,4 @@
 };
 
 
-#endif // UNITYPLACESPLUGIN_H
+#endif // UNITY2DPLUGIN_H

=== renamed file 'places/UnityPlaces/qmldir' => 'libunity-2d/Unity2d/qmldir'
--- places/UnityPlaces/qmldir	2010-10-14 01:57:24 +0000
+++ libunity-2d/Unity2d/qmldir	2011-01-27 16:58:50 +0000
@@ -1,1 +1,1 @@
-plugin UnityPlaces
+plugin unity-2d-qml

=== renamed file 'places/UnityPlaces/qsortfilterproxymodelqml.cpp' => 'libunity-2d/Unity2d/qsortfilterproxymodelqml.cpp'
=== renamed file 'places/UnityPlaces/qsortfilterproxymodelqml.h' => 'libunity-2d/Unity2d/qsortfilterproxymodelqml.h'
=== renamed file 'places/UnityPlaces/windowimageprovider.cpp' => 'libunity-2d/Unity2d/windowimageprovider.cpp'
=== renamed file 'places/UnityPlaces/windowimageprovider.h' => 'libunity-2d/Unity2d/windowimageprovider.h'
=== renamed file 'places/UnityPlaces/windowinfo.cpp' => 'libunity-2d/Unity2d/windowinfo.cpp'
=== renamed file 'places/UnityPlaces/windowinfo.h' => 'libunity-2d/Unity2d/windowinfo.h'
=== renamed file 'places/UnityPlaces/windowslist.cpp' => 'libunity-2d/Unity2d/windowslist.cpp'
=== renamed file 'places/UnityPlaces/windowslist.h' => 'libunity-2d/Unity2d/windowslist.h'
=== added directory 'libunity-2d/src'
=== added file 'libunity-2d/src/CMakeLists.txt'
--- libunity-2d/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libunity-2d/src/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -0,0 +1,39 @@
+# Sources
+set(libunity-2d_SRCS
+    keyboardmodifiersmonitor.cpp
+    unity2dapplication.cpp
+    unity2dpanel.cpp
+    )
+
+# Build
+qt4_automoc(${libunity-2d_SRCS})
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+add_library(unity-2d SHARED ${libunity-2d_SRCS})
+set_target_properties(unity-2d PROPERTIES
+    VERSION ${libunity-2d_VERSION}
+    SOVERSION ${libunity-2d_SOVERSION}
+    )
+
+target_link_libraries(unity-2d
+    ${QT_QTGUI_LIBRARIES}
+    ${QT_QTCORE_LIBRARIES}
+    ${X11_LIBRARIES}
+    )
+
+# Install
+install(TARGETS unity-2d
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+    )
+
+install(DIRECTORY .
+    DESTINATION include/unity-2d
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN "*_p.h" EXCLUDE
+    )

=== renamed file 'panel/lib/debug_p.h' => 'libunity-2d/src/debug_p.h'
=== renamed file 'panel/lib/keyboardmodifiersmonitor.cpp' => 'libunity-2d/src/keyboardmodifiersmonitor.cpp'
=== renamed file 'panel/lib/keyboardmodifiersmonitor.h' => 'libunity-2d/src/keyboardmodifiersmonitor.h'
=== renamed file 'panel/lib/unity2dapplication.cpp' => 'libunity-2d/src/unity2dapplication.cpp'
=== renamed file 'panel/lib/unity2dapplication.h' => 'libunity-2d/src/unity2dapplication.h'
=== added file 'libunity-2d/src/unity2dpanel.cpp'
--- libunity-2d/src/unity2dpanel.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d/src/unity2dpanel.cpp	2011-01-27 16:58:50 +0000
@@ -0,0 +1,164 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "unity2dpanel.h"
+
+// Qt
+#include <QApplication>
+#include <QDebug>
+#include <QDesktopWidget>
+#include <QPainter>
+#include <QHBoxLayout>
+#include <QX11Info>
+
+// X
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+struct Unity2dPanelPrivate
+{
+    Unity2dPanel* q;
+    Unity2dPanel::Edge m_edge;
+    QHBoxLayout* m_layout;
+
+    void updateStrut()
+    {
+        QDesktopWidget* desktop = QApplication::desktop();
+        const QRect screen = desktop->screenGeometry(q);
+        const QRect available = desktop->availableGeometry(q);
+        QRect rect;
+
+        Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
+
+        ulong struts[12];
+        switch (m_edge) {
+        case Unity2dPanel::LeftEdge:
+            rect = QRect(screen.left(), available.top(), q->width(), available.height());
+            struts = {
+                q->width(), 0, 0, 0,
+                available.top(), available.bottom(), 0, 0,
+                0, 0, 0, 0
+                };
+            break;
+        case Unity2dPanel::TopEdge:
+            rect = QRect(screen.left(), screen.top(), screen.width(), q->height());
+            struts = {
+                0, 0, q->height(), 0,
+                0, 0, 0, 0,
+                screen.left(), screen.right(), 0, 0
+                };
+            break;
+        }
+
+        q->setGeometry(rect);
+
+        XChangeProperty(QX11Info::display(), q->effectiveWinId(), atom,
+                        XA_CARDINAL, 32, PropModeReplace,
+                        (unsigned char *) &struts, 12);
+    }
+
+    void updateLayoutDirection()
+    {
+        QBoxLayout::Direction direction;
+        switch(m_edge) {
+        case Unity2dPanel::TopEdge:
+            direction = QApplication::isRightToLeft() ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight;
+            break;
+        case Unity2dPanel::LeftEdge:
+            direction = QBoxLayout::TopToBottom;
+            break;
+        }
+        m_layout->setDirection(direction);
+    }
+
+    void updateEdge()
+    {
+        updateStrut();
+        updateLayoutDirection();
+    }
+};
+
+Unity2dPanel::Unity2dPanel(QWidget* parent)
+: QWidget(parent)
+, d(new Unity2dPanelPrivate)
+{
+    d->q = this;
+    d->m_edge = Unity2dPanel::TopEdge;
+    d->m_layout = new QHBoxLayout(this);
+    d->m_layout->setMargin(0);
+    d->m_layout->setSpacing(0);
+    setAttribute(Qt::WA_X11NetWmWindowTypeDock);
+    setAttribute(Qt::WA_Hover);
+    setAutoFillBackground(true);
+    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(slotWorkAreaResized(int)));
+}
+
+Unity2dPanel::~Unity2dPanel()
+{
+    delete d;
+}
+
+void Unity2dPanel::setEdge(Unity2dPanel::Edge edge)
+{
+    d->m_edge = edge;
+    if (isVisible()) {
+        d->updateEdge();
+    }
+}
+
+Unity2dPanel::Edge Unity2dPanel::edge() const
+{
+    return d->m_edge;
+}
+
+void Unity2dPanel::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+    d->updateEdge();
+}
+
+void Unity2dPanel::slotWorkAreaResized(int screen)
+{
+    if (x11Info().screen() == screen) {
+        d->updateEdge();
+    }
+}
+
+void Unity2dPanel::paintEvent(QPaintEvent* event)
+{
+    // Necessary because Oxygen thinks it knows better what to paint in the background
+    QPainter painter(this);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.fillRect(rect(), palette().brush(QPalette::Background));
+}
+
+void Unity2dPanel::addWidget(QWidget* widget)
+{
+    d->m_layout->addWidget(widget);
+}
+
+void Unity2dPanel::addSpacer()
+{
+    d->m_layout->addStretch();
+}
+
+#include "unity2dpanel.moc"

=== added file 'libunity-2d/src/unity2dpanel.h'
--- libunity-2d/src/unity2dpanel.h	1970-01-01 00:00:00 +0000
+++ libunity-2d/src/unity2dpanel.h	2011-01-27 16:58:50 +0000
@@ -0,0 +1,62 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY2DPANEL_H
+#define UNITY2DPANEL_H
+
+// Local
+
+// Qt
+#include <QWidget>
+
+struct Unity2dPanelPrivate;
+class Unity2dPanel : public QWidget
+{
+Q_OBJECT
+public:
+    enum Edge {
+        LeftEdge,
+        TopEdge
+    };
+
+    Unity2dPanel(QWidget* parent = 0);
+    ~Unity2dPanel();
+
+    void setEdge(Edge);
+    Edge edge() const;
+
+    void addWidget(QWidget*);
+
+    void addSpacer();
+
+protected:
+    virtual void showEvent(QShowEvent*);
+    virtual void paintEvent(QPaintEvent*);
+
+private Q_SLOTS:
+    void slotWorkAreaResized(int screen);
+
+private:
+    Q_DISABLE_COPY(Unity2dPanel)
+    Unity2dPanelPrivate* const d;
+};
+
+#endif /* UNITY2DPANEL_H */

=== added directory 'libunity-2d/tests'
=== added file 'libunity-2d/tests/CMakeLists.txt'
--- libunity-2d/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libunity-2d/tests/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -0,0 +1,30 @@
+macro(libunity_2d_tests)
+    set(_test_list "")
+    foreach(_test ${ARGN})
+        add_test(${_test} ${_test})
+        add_executable(${_test} ${_test}.cpp ${_test}.moc)
+        qt4_generate_moc(${_test}.cpp ${_test}.moc)
+        target_link_libraries(${_test}
+            ${QT_QTTEST_LIBRARIES}
+            unity-2d
+            )
+        set(_test_list "${_test_list};${_test}")
+    endforeach(_test)
+
+    add_custom_target(libunity-2d_check COMMAND ${CMAKE_CTEST_COMMAND} --verbose
+        DEPENDS ${_test_list})
+    add_dependencies(check libunity-2d_check)
+endmacro(libunity_2d_tests)
+
+include_directories(
+    ${libunity-2d_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${QT_QTTEST_INCLUDE_DIR}
+    )
+
+enable_testing()
+
+libunity_2d_tests(
+    keyboardmodifiersmonitortest
+    paneltest
+    )

=== renamed file 'panel/tests/keyboardmodifiersmonitortest.cpp' => 'libunity-2d/tests/keyboardmodifiersmonitortest.cpp'
=== added file 'libunity-2d/tests/paneltest.cpp'
--- libunity-2d/tests/paneltest.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d/tests/paneltest.cpp	2011-01-27 16:58:50 +0000
@@ -0,0 +1,82 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Local
+#include <unity2dpanel.h>
+
+// Qt
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QtTestGui>
+
+class PanelTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testSetEdge()
+    {
+        QRect screen = QApplication::desktop()->screenGeometry();
+        QRect available = QApplication::desktop()->availableGeometry();
+
+        Unity2dPanel panel;
+        panel.setFixedHeight(16);
+        panel.setEdge(Unity2dPanel::TopEdge);
+        panel.show();
+        QTest::qWait(500);
+
+        QRect expectedGeometry = QRect(screen.left(), screen.top(), screen.width(), 16);
+        QCOMPARE(panel.geometry(), expectedGeometry);
+        QCOMPARE(QApplication::desktop()->availableGeometry(), available.adjusted(0, 16, 0, 0));
+    }
+
+    void testAddQWidget()
+    {
+        Unity2dPanel panel;
+        QWidget* widget1 = new QWidget;
+        QWidget* widget2 = new QWidget;
+        panel.addWidget(widget1);
+        panel.addWidget(widget2);
+        panel.show();
+
+        QCOMPARE(widget1->geometry(), QRect(0, 0, panel.width() / 2, panel.height()));
+        QCOMPARE(widget2->geometry(), QRect(panel.width() / 2, 0, panel.width() / 2, panel.height()));
+    }
+
+    void testAddSpacer()
+    {
+        Unity2dPanel panel;
+        QWidget* widget1 = new QWidget;
+        widget1->setFixedWidth(100);
+        QWidget* widget2 = new QWidget;
+        widget2->setFixedWidth(200);
+        panel.addWidget(widget1);
+        panel.addSpacer();
+        panel.addWidget(widget2);
+        panel.show();
+
+        QCOMPARE(widget1->geometry(), QRect(0, 0, 100, panel.height()));
+        QCOMPARE(widget2->geometry(), QRect(panel.width() - 200, 0, 200, panel.height()));
+    }
+};
+
+QTEST_MAIN(PanelTest)
+
+#include "paneltest.moc"

=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-01-14 20:42:44 +0000
+++ panel/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -2,17 +2,13 @@
 
 # Source
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+    ${libunity-2d_SOURCE_DIR}/src
     )
 
-add_subdirectory(lib)
 add_subdirectory(applets)
 add_subdirectory(app)
 add_subdirectory(tests)
 
-# Tests
-add_custom_target(check DEPENDS panel_check launcher_check)
-
 # Install
 install(DIRECTORY artwork
     DESTINATION ${UNITY_2D_DIR}/panel

=== modified file 'panel/app/CMakeLists.txt'
--- panel/app/CMakeLists.txt	2011-01-14 20:42:44 +0000
+++ panel/app/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -1,5 +1,6 @@
 set(panel_SRCS
     main.cpp
+    unity2dstyle.cpp
     )
 
 qt4_automoc(${panel_SRCS})
@@ -7,14 +8,17 @@
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../applets
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${uqapplets_SOURCE_DIR}
+    ${uqapplets_SOURCE_DIR}/common
+    ${libunity-2d_SOURCE_DIR}/src
     )
 
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
     uqapplets
-    uqpanel
+    unity-2d
     )
 
 install(TARGETS unity-2d-panel

=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-01-22 03:55:39 +0000
+++ panel/app/main.cpp	2011-01-27 16:58:50 +0000
@@ -30,7 +30,7 @@
 #include <legacytray/legacytrayapplet.h>
 
 // Unity
-#include <panel.h>
+#include <unity2dpanel.h>
 #include <unity2dapplication.h>
 #include <unity2dstyle.h>
 
@@ -100,8 +100,8 @@
     QApplication::setColorSpec(QApplication::ManyColor);
     Unity2dApplication app(argc, argv);
     QApplication::setStyle(new Unity2dStyle);
-    Panel panel;
-    panel.setEdge(Panel::TopEdge);
+    Unity2dPanel panel;
+    panel.setEdge(Unity2dPanel::TopEdge);
     panel.setPalette(getPalette());
     panel.setFixedHeight(24);
 

=== renamed file 'panel/lib/unity2dstyle.cpp' => 'panel/app/unity2dstyle.cpp'
--- panel/lib/unity2dstyle.cpp	2011-01-15 01:41:03 +0000
+++ panel/app/unity2dstyle.cpp	2011-01-27 16:58:50 +0000
@@ -24,7 +24,7 @@
 
 // Local
 
-// uqpanel
+// libunity-2d
 #include <debug_p.h>
 #include <keyboardmodifiersmonitor.h>
 

=== renamed file 'panel/lib/unity2dstyle.h' => 'panel/app/unity2dstyle.h'
=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-01-18 11:35:24 +0000
+++ panel/applets/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -19,6 +19,7 @@
     appname/menubarwidget.cpp
     appname/registrar.cpp
     appname/windowhelper.cpp
+    common/applet.cpp
     homebutton/homebuttonapplet.cpp
     indicator/abstractindicator.cpp
     indicator/datetimeindicator.cpp
@@ -43,6 +44,7 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/appindicator
     ${CMAKE_CURRENT_SOURCE_DIR}/appname
+    ${CMAKE_CURRENT_SOURCE_DIR}/common
     ${CMAKE_CURRENT_SOURCE_DIR}/homebutton
     ${CMAKE_CURRENT_SOURCE_DIR}/indicator
     ${QTBAMF_INCLUDE_DIRS}
@@ -69,5 +71,4 @@
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xfixes_LIB}
-    uqpanel
     )

=== added directory 'panel/applets/common'
=== renamed file 'panel/lib/applet.cpp' => 'panel/applets/common/applet.cpp'
--- panel/lib/applet.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/common/applet.cpp	2011-01-27 16:58:50 +0000
@@ -22,16 +22,6 @@
 // Self
 #include "applet.h"
 
-// Local
-#include <panel.h>
-
-// Qt
-#include <QApplication>
-#include <QPainter>
-
-// System
-#include <iostream>
-
 namespace Unity2d
 {
 

=== renamed file 'panel/lib/applet.h' => 'panel/applets/common/applet.h'
=== modified file 'panel/applets/legacytray/fdotask.cpp'
--- panel/applets/legacytray/fdotask.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/legacytray/fdotask.cpp	2011-01-27 16:58:50 +0000
@@ -26,7 +26,7 @@
 #include "x11embedcontainer.h"
 #include "x11embeddelegate.h"
 
-// uqpanel
+// libunity-2d
 #include <debug_p.h>
 
 // Qt

=== modified file 'panel/applets/legacytray/legacytrayapplet.cpp'
--- panel/applets/legacytray/legacytrayapplet.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/legacytray/legacytrayapplet.cpp	2011-01-27 16:58:50 +0000
@@ -26,7 +26,7 @@
 #include "fdoselectionmanager.h"
 #include "fdotask.h"
 
-// uqpanel
+// libunity-2d
 #include <debug_p.h>
 
 // Qt

=== removed directory 'panel/lib'
=== removed file 'panel/lib/CMakeLists.txt'
--- panel/lib/CMakeLists.txt	2011-01-14 20:42:56 +0000
+++ panel/lib/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Sources
-set(libuqpanel_SRCS
-    applet.cpp
-    keyboardmodifiersmonitor.cpp
-    panel.cpp
-    unity2dapplication.cpp
-    unity2dstyle.cpp
-    )
-
-set(libuqpanel_VERSION 0.0.0)
-set(libuqpanel_SOVERSION 0)
-
-# Build
-qt4_automoc(${libuqpanel_SRCS})
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-configure_file(libuqpanel.pc.in ${CMAKE_BINARY_DIR}/libuqpanel.pc @ONLY)
-
-add_library(uqpanel SHARED ${libuqpanel_SRCS})
-set_target_properties(uqpanel PROPERTIES
-    VERSION ${libuqpanel_VERSION}
-    SOVERSION ${libuqpanel_SOVERSION}
-    )
-
-target_link_libraries(uqpanel
-    ${QT_QTGUI_LIBRARIES}
-    ${QT_QTCORE_LIBRARIES}
-    )
-
-# Install
-install(TARGETS uqpanel
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION bin
-    )
-
-install(DIRECTORY .
-    DESTINATION include/uqpanel
-    FILES_MATCHING PATTERN "*.h"
-    PATTERN "*_p.h" EXCLUDE
-    )
-
-install(FILES ${CMAKE_BINARY_DIR}/libuqpanel.pc
-    DESTINATION lib/pkgconfig
-    )

=== removed file 'panel/lib/libuqpanel.pc.in'
--- panel/lib/libuqpanel.pc.in	2011-01-14 20:42:06 +0000
+++ panel/lib/libuqpanel.pc.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
-includedir=@CMAKE_INSTALL_PREFIX@/include/libuqpanel
-
-Name: libuqpanel
-Description: Library to create Unity 2d panel applets
-Version: @libgui_VERSION@
-Libs: -L${libdir} -luqpanel
-Cflags: -I${includedir}

=== removed file 'panel/lib/panel.cpp'
--- panel/lib/panel.cpp	2011-01-15 01:41:03 +0000
+++ panel/lib/panel.cpp	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Self
-#include "panel.h"
-
-// Local
-#include "applet.h"
-
-// Qt
-#include <QApplication>
-#include <QDebug>
-#include <QDesktopWidget>
-#include <QPainter>
-#include <QHBoxLayout>
-#include <QX11Info>
-
-// X
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-namespace Unity2d
-{
-
-struct PanelPrivate
-{
-    Panel* q;
-    Panel::Edge m_edge;
-    QHBoxLayout* m_layout;
-
-    void updateStrut()
-    {
-        QDesktopWidget* desktop = QApplication::desktop();
-        const QRect screen = desktop->screenGeometry(q);
-        const QRect available = desktop->availableGeometry(q);
-        QRect rect;
-
-        Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
-
-        ulong struts[12];
-        switch (m_edge) {
-        case Panel::LeftEdge:
-            rect = QRect(screen.left(), available.top(), q->width(), available.height());
-            struts = {
-                q->width(), 0, 0, 0,
-                available.top(), available.bottom(), 0, 0,
-                0, 0, 0, 0
-                };
-            break;
-        case Panel::TopEdge:
-            rect = QRect(screen.left(), screen.top(), screen.width(), q->height());
-            struts = {
-                0, 0, q->height(), 0,
-                0, 0, 0, 0,
-                screen.left(), screen.right(), 0, 0
-                };
-            break;
-        }
-
-        q->setGeometry(rect);
-
-        XChangeProperty(QX11Info::display(), q->effectiveWinId(), atom,
-                        XA_CARDINAL, 32, PropModeReplace,
-                        (unsigned char *) &struts, 12);
-    }
-
-    void updateLayoutDirection()
-    {
-        QBoxLayout::Direction direction;
-        switch(m_edge) {
-        case Panel::TopEdge:
-            direction = QApplication::isRightToLeft() ? QBoxLayout::RightToLeft : QBoxLayout::LeftToRight;
-            break;
-        case Panel::LeftEdge:
-            direction = QBoxLayout::TopToBottom;
-            break;
-        }
-        m_layout->setDirection(direction);
-    }
-
-    void updateEdge()
-    {
-        updateStrut();
-        updateLayoutDirection();
-    }
-};
-
-Panel::Panel(QWidget* parent)
-: QWidget(parent)
-, d(new PanelPrivate)
-{
-    d->q = this;
-    d->m_edge = Panel::TopEdge;
-    d->m_layout = new QHBoxLayout(this);
-    d->m_layout->setMargin(0);
-    d->m_layout->setSpacing(0);
-    setAttribute(Qt::WA_X11NetWmWindowTypeDock);
-    setAttribute(Qt::WA_Hover);
-    setAutoFillBackground(true);
-    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(workAreaResized(int)));
-}
-
-Panel::~Panel()
-{
-    delete d;
-}
-
-void Panel::setEdge(Panel::Edge edge)
-{
-    d->m_edge = edge;
-    if (isVisible()) {
-        d->updateEdge();
-    }
-}
-
-Panel::Edge Panel::edge() const
-{
-    return d->m_edge;
-}
-
-void Panel::showEvent(QShowEvent* event)
-{
-    QWidget::showEvent(event);
-    d->updateEdge();
-}
-
-void Panel::workAreaResized(int screen)
-{
-    if (this->x11Info().screen() == screen) {
-        d->updateEdge();
-    }
-}
-
-void Panel::paintEvent(QPaintEvent* event)
-{
-    // Necessary because Oxygen thinks it knows better what to paint in the background
-    QPainter painter(this);
-    painter.setCompositionMode(QPainter::CompositionMode_Source);
-    painter.fillRect(rect(), palette().brush(QPalette::Background));
-}
-
-void Panel::addWidget(QWidget* widget)
-{
-    d->m_layout->addWidget(widget);
-}
-
-void Panel::addSpacer()
-{
-    d->m_layout->addStretch();
-}
-
-} // namespace
-
-#include "panel.moc"

=== removed file 'panel/lib/panel.h'
--- panel/lib/panel.h	2011-01-15 01:41:03 +0000
+++ panel/lib/panel.h	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PANEL_H
-#define PANEL_H
-
-// Local
-
-// Qt
-#include <QWidget>
-
-namespace Unity2d
-{
-
-struct PanelPrivate;
-class Panel : public QWidget
-{
-Q_OBJECT
-public:
-    enum Edge {
-        LeftEdge,
-        TopEdge
-    };
-
-    Panel(QWidget* parent = 0);
-    ~Panel();
-
-    void setEdge(Edge);
-    Edge edge() const;
-
-    void addWidget(QWidget*);
-
-    void addSpacer();
-
-protected:
-    virtual void showEvent(QShowEvent*);
-    virtual void paintEvent(QPaintEvent*);
-
-private:
-    Q_DISABLE_COPY(Panel)
-    PanelPrivate* const d;
-
-protected Q_SLOTS:
-    void workAreaResized(int screen);
-};
-
-} // namespace
-
-#endif /* PANEL_H */

=== modified file 'panel/tests/CMakeLists.txt'
--- panel/tests/CMakeLists.txt	2011-01-06 13:04:35 +0000
+++ panel/tests/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -7,18 +7,18 @@
         target_link_libraries(${_test}
             ${QT_QTTEST_LIBRARIES}
             uqapplets
-            uqpanel
             )
         set(_test_list "${_test_list};${_test}")
     endforeach(_test)
 
     add_custom_target(panel_check COMMAND ${CMAKE_CTEST_COMMAND} --verbose
         DEPENDS ${_test_list})
+    add_dependencies(check panel_check)
 endmacro(panel_tests)
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../lib
-    ${CMAKE_CURRENT_SOURCE_DIR}/../applets/homebutton
+    ${uqapplets_SOURCE_DIR}/homebutton
+    ${uqapplets_SOURCE_DIR}/common
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTTEST_INCLUDE_DIR}
     )
@@ -26,7 +26,5 @@
 enable_testing()
 
 panel_tests(
-    paneltest
     homebuttonapplettest
-    keyboardmodifiersmonitortest
     )

=== removed file 'panel/tests/paneltest.cpp'
--- panel/tests/paneltest.cpp	2011-01-15 01:41:03 +0000
+++ panel/tests/paneltest.cpp	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010 Canonical Ltd.
- *
- * Authors:
- * - Aurélien Gâteau <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Local
-#include <panel.h>
-
-// Qt
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QtTestGui>
-
-using namespace Unity2d;
-
-class PanelTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void testSetEdge()
-    {
-        QRect screen = QApplication::desktop()->screenGeometry();
-        QRect available = QApplication::desktop()->availableGeometry();
-
-        Panel panel;
-        panel.setFixedHeight(16);
-        panel.setEdge(Panel::TopEdge);
-        panel.show();
-        QTest::qWait(500);
-
-        QRect expectedGeometry = QRect(screen.left(), screen.top(), screen.width(), 16);
-        QCOMPARE(panel.geometry(), expectedGeometry);
-        QCOMPARE(QApplication::desktop()->availableGeometry(), available.adjusted(0, 16, 0, 0));
-    }
-
-    void testAddQWidget()
-    {
-        Panel panel;
-        QWidget* widget1 = new QWidget;
-        QWidget* widget2 = new QWidget;
-        panel.addWidget(widget1);
-        panel.addWidget(widget2);
-        panel.show();
-
-        QCOMPARE(widget1->geometry(), QRect(0, 0, panel.width() / 2, panel.height()));
-        QCOMPARE(widget2->geometry(), QRect(panel.width() / 2, 0, panel.width() / 2, panel.height()));
-    }
-
-    void testAddSpacer()
-    {
-        Panel panel;
-        QWidget* widget1 = new QWidget;
-        widget1->setFixedWidth(100);
-        QWidget* widget2 = new QWidget;
-        widget2->setFixedWidth(200);
-        panel.addWidget(widget1);
-        panel.addSpacer();
-        panel.addWidget(widget2);
-        panel.show();
-
-        QCOMPARE(widget1->geometry(), QRect(0, 0, 100, panel.height()));
-        QCOMPARE(widget2->geometry(), QRect(panel.width() - 200, 0, 200, panel.height()));
-    }
-};
-
-QTEST_MAIN(PanelTest)
-
-#include "paneltest.moc"

=== modified file 'places/CMakeLists.txt'
--- places/CMakeLists.txt	2011-01-14 20:42:44 +0000
+++ places/CMakeLists.txt	2011-01-27 16:58:50 +0000
@@ -2,7 +2,6 @@
 
 # Source
 add_subdirectory(app)
-add_subdirectory(UnityPlaces)
 
 file(GLOB places_QML *.qml *.js)
 

=== modified file 'places/GnomeBackground.qml'
--- places/GnomeBackground.qml	2011-01-20 04:29:08 +0000
+++ places/GnomeBackground.qml	2011-01-27 16:58:50 +0000
@@ -1,7 +1,7 @@
 import Qt 4.7
 import gconf 1.0
 /* Necessary to access the blended image provider and CacheEffect */
-import UnityPlaces 1.0
+import Unity2d 1.0
 
 Item {
     property string overlay_color

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-01-06 23:19:27 +0000
+++ places/Home.qml	2011-01-27 16:58:50 +0000
@@ -1,6 +1,6 @@
 import Qt 4.7
 import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
-import UnityPlaces 1.0 /* Necessary for QSortFilterProxyModelQML */
+import Unity2d 1.0 /* Necessary for QSortFilterProxyModelQML */
 import gconf 1.0
 
 Item {

=== modified file 'places/PlaceEntryView.qml'
--- places/PlaceEntryView.qml	2011-01-07 05:47:18 +0000
+++ places/PlaceEntryView.qml	2011-01-27 16:58:50 +0000
@@ -1,5 +1,5 @@
 import Qt 4.7
-import UnityPlaces 1.0 /* Necessary for QSortFilterProxyModelQML */
+import Unity2d 1.0 /* Necessary for QSortFilterProxyModelQML */
 
 Item {
     id: placeEntryView

=== modified file 'places/RendererGrid.qml'
--- places/RendererGrid.qml	2011-01-07 05:47:50 +0000
+++ places/RendererGrid.qml	2011-01-27 16:58:50 +0000
@@ -1,6 +1,5 @@
 import Qt 4.7
 import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons */
-import UnityPlaces 1.0
 
 /* Renderers typically use a grid layout to render the model. The RendererGrid
    component provides a standard implementation of such a layout where the

=== removed directory 'places/UnityPlaces'
=== removed file 'places/UnityPlaces/qdbusconnectionqml.cpp'
--- places/UnityPlaces/qdbusconnectionqml.cpp	2011-01-15 01:41:03 +0000
+++ places/UnityPlaces/qdbusconnectionqml.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qdbusconnectionqml.h"
-
-QDBusConnectionQML::QDBusConnectionQML(QObject *parent) : QObject(parent), m_interface(NULL)
-{
-    QObject::connect(this, SIGNAL(objectPathChanged(QString)), this, SLOT(connectToDBus()));
-    QObject::connect(this, SIGNAL(serviceChanged(QString)), this, SLOT(connectToDBus()));
-}
-
-QDBusConnectionQML::~QDBusConnectionQML()
-{
-    if (m_interface != NULL)
-        delete m_interface;
-}
-
-QString
-QDBusConnectionQML::objectPath() const
-{
-    return m_objectPath;
-}
-
-QString
-QDBusConnectionQML::service() const
-{
-    return m_service;
-}
-
-void
-QDBusConnectionQML::setObjectPath(QString objectPath)
-{
-    m_objectPath = objectPath;
-    emit objectPathChanged(m_objectPath);
-}
-
-void
-QDBusConnectionQML::setService(QString service)
-{
-    m_service = service;
-    emit serviceChanged(m_service);
-}
-
-void
-QDBusConnectionQML::connectToDBus()
-{
-    if (m_interface != NULL)
-        delete m_interface;
-
-    if (m_service.isEmpty() || m_objectPath.isEmpty())
-        return;
-
-    m_interface = new QDBusInterface(m_service, m_objectPath);
-}

=== removed file 'places/UnityPlaces/qdbusconnectionqml.h'
--- places/UnityPlaces/qdbusconnectionqml.h	2011-01-15 01:41:03 +0000
+++ places/UnityPlaces/qdbusconnectionqml.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef QDBUSCONNECTIONQML_H
-#define QDBUSCONNECTIONQML_H
-
-#include <QObject>
-#include <QDBusInterface>
-
-class QDBusConnectionQML : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString objectPath READ objectPath WRITE setObjectPath NOTIFY objectPathChanged)
-    Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
-
-public:
-    QDBusConnectionQML(QObject *parent = 0);
-    ~QDBusConnectionQML();
-
-    /* getters */
-    QString objectPath() const;
-    QString service() const;
-
-    /* setters */
-    void setObjectPath(QString objectPath);
-    void setService(QString service);
-
-private slots:
-    void connectToDBus();
-
-signals:
-    void objectPathChanged(QString);
-    void serviceChanged(QString);
-
-protected:
-    QString m_service;
-    QString m_objectPath;
-    QDBusInterface* m_interface;
-};
-
-#endif
-

=== removed file 'places/UnityPlaces/unity_place.h'
--- places/UnityPlaces/unity_place.h	2011-01-15 01:41:03 +0000
+++ places/UnityPlaces/unity_place.h	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UNITY_PLACE_H
-#define UNITY_PLACE_H
-
-#include <QDBusConnection>
-#include <QDBusReply>
-#include <QDebug>
-#include <QDBusMetaType>
-
-#include "qdbusconnectionqml.h"
-
-
-class UnityPlace : public QDBusConnectionQML
-{
-    Q_OBJECT
-
-
-
-public:
-    UnityPlace(QObject *parent = 0) : QDBusConnectionQML(parent)
-    {
-
-        QObject::connect(this, SIGNAL(objectPathChanged(QString)), this, SLOT(connectSignals()));
-        QObject::connect(this, SIGNAL(serviceChanged(QString)), this, SLOT(connectSignals()));
-    }
-
-    ~UnityPlace()
-    {
-    }
-
-    Q_SLOT void connectSignals()
-    {
-        // FIXME: missing disconnection
-        if(m_service.isEmpty() || m_objectPath.isEmpty())
-            return;
-
-        QObject::connect(m_interface, SIGNAL(EntryRemoved(QString)), this, SIGNAL(entryRemoved(QString)));
-    }
-
-    Q_INVOKABLE inline QString Introspect()
-    {
-        if (m_interface == NULL)
-            return QString();
-
-        QList<QVariant> argumentList;
-
-        QDBusReply<QString> reply = m_interface->callWithArgumentList(QDBus::Block, "Introspect", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return QString();
-        }
-      return reply.value();
-    }
-    Q_INVOKABLE inline QVariant Get(QString interface, QString propname)
-    {
-        if (m_interface == NULL)
-            return QVariant();
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(interface);
-        argumentList << qVariantFromValue(propname);
-
-        QDBusReply<QVariant> reply = m_interface->callWithArgumentList(QDBus::Block, "Get", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return QVariant();
-        }
-      return reply.value();
-    }
-    Q_INVOKABLE inline void Set(QString interface, QString propname, QVariant value)
-    {
-        if (m_interface == NULL)
-            return;
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(interface);
-        argumentList << qVariantFromValue(propname);
-        argumentList << qVariantFromValue(value);
-
-        QDBusReply<void> reply = m_interface->callWithArgumentList(QDBus::Block, "Set", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return;
-        }
-    }
-    Q_INVOKABLE inline QHash<QString, QVariant> GetAll(QString interface)
-    {
-        if (m_interface == NULL)
-            return QHash<QString, QVariant>();
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(interface);
-
-        QDBusReply<QHash<QString, QVariant>> reply = m_interface->callWithArgumentList(QDBus::Block, "GetAll", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return QHash<QString, QVariant>();
-        }
-      return reply.value();
-    }
-    Q_INVOKABLE inline uint Activate(QString uri)
-    {
-        if (m_interface == NULL)
-            return uint();
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(uri);
-
-        QDBusReply<uint> reply = m_interface->callWithArgumentList(QDBus::Block, "Activate", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return uint();
-        }
-      return reply.value();
-    }
-
-Q_SIGNALS:
-    void entryRemoved(QString);
-};
-#endif

=== removed file 'places/UnityPlaces/unity_place.xml'
--- places/UnityPlaces/unity_place.xml	2010-10-17 05:04:46 +0000
+++ places/UnityPlaces/unity_place.xml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-<interface name="org.freedesktop.DBus.Introspectable">
-  <method name="Introspect">
-    <arg name="data" direction="out" type="s"/>
-  </method>
-</interface>
-<interface name="org.freedesktop.DBus.Properties">
-  <method name="Get">
-    <arg name="interface" direction="in" type="s"/>
-    <arg name="propname" direction="in" type="s"/>
-    <arg name="value" direction="out" type="v"/>
-  </method>
-  <method name="Set">
-    <arg name="interface" direction="in" type="s"/>
-    <arg name="propname" direction="in" type="s"/>
-    <arg name="value" direction="in" type="v"/>
-  </method>
-  <method name="GetAll">
-    <arg name="interface" direction="in" type="s"/>
-    <arg name="props" direction="out" type="a{sv}"/>
-  </method>
-</interface>
-<interface name="com.canonical.Unity.Place">
-  <signal name="EntryRemoved">
-    <arg name="entry_dbus_path" type="s"/>
-  </signal>
-</interface>
-<interface name="com.canonical.Unity.Activation">
-  <method name="Activate">
-    <arg name="uri" type="s" direction="in"/>
-    <arg name="result" type="u" direction="out"/>
-  </method>
-</interface>
-<node name="browser"/>
-<node name="files"/>
-</node>
-

=== removed file 'places/UnityPlaces/unity_place_entry.h'
--- places/UnityPlaces/unity_place_entry.h	2011-01-15 01:41:03 +0000
+++ places/UnityPlaces/unity_place_entry.h	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UNITY_PLACE_ENTRY_H
-#define UNITY_PLACE_ENTRY_H
-
-#include <QDBusConnection>
-#include <QDBusReply>
-#include <QDebug>
-#include <QDBusMetaType>
-
-#include "qdbusconnectionqml.h"
-
-
-typedef QHash<QString, QString> QHashQStringQString;
-Q_DECLARE_METATYPE(QHashQStringQString)
-
-class UnityPlaceEntry : public QDBusConnectionQML
-{
-    Q_OBJECT
-
-
-
-public:
-    UnityPlaceEntry(QObject *parent = 0) : QDBusConnectionQML(parent)
-    {
-        qDBusRegisterMetaType<QHashQStringQString>();
-
-        QObject::connect(this, SIGNAL(objectPathChanged(QString)), this, SLOT(connectSignals()));
-        QObject::connect(this, SIGNAL(serviceChanged(QString)), this, SLOT(connectSignals()));
-    }
-
-    ~UnityPlaceEntry()
-    {
-    }
-
-    Q_SLOT void connectSignals()
-    {
-        // FIXME: missing disconnection
-        if(m_service.isEmpty() || m_objectPath.isEmpty())
-            return;
-
-        QObject::connect(m_interface, SIGNAL(EntryRendererInfoChanged()), this, SIGNAL(entryRendererInfoChanged()));
-        QObject::connect(m_interface, SIGNAL(GlobalRendererInfoChanged()), this, SIGNAL(globalRendererInfoChanged()));
-        QObject::connect(m_interface, SIGNAL(PlaceEntryInfoChanged()), this, SIGNAL(placeEntryInfoChanged()));
-    }
-
-    Q_INVOKABLE inline QString Introspect()
-    {
-        if (m_interface == NULL)
-            return QString();
-
-        QList<QVariant> argumentList;
-
-        QDBusReply<QString> reply = m_interface->callWithArgumentList(QDBus::Block, "Introspect", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return QString();
-        }
-      return reply.value();
-    }
-    Q_INVOKABLE inline void SetGlobalSearch(QString search, QHashQStringQString hints)
-    {
-        if (m_interface == NULL)
-            return;
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(search);
-        argumentList << qVariantFromValue(hints);
-
-        QDBusReply<void> reply = m_interface->callWithArgumentList(QDBus::Block, "SetGlobalSearch", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return;
-        }
-    }
-    Q_INVOKABLE inline void SetSearch(QString search, QHashQStringQString hints)
-    {
-        if (m_interface == NULL)
-            return;
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(search);
-        argumentList << qVariantFromValue(hints);
-
-        QDBusReply<void> reply = m_interface->callWithArgumentList(QDBus::Block, "SetSearch", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return;
-        }
-    }
-    Q_INVOKABLE inline void SetActive(bool is_active)
-    {
-        if (m_interface == NULL)
-            return;
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(is_active);
-
-        QDBusReply<void> reply = m_interface->callWithArgumentList(QDBus::Block, "SetActive", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return;
-        }
-    }
-    Q_INVOKABLE inline void SetActiveSection(uint section_id)
-    {
-        if (m_interface == NULL)
-            return;
-
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(section_id);
-
-        QDBusReply<void> reply = m_interface->callWithArgumentList(QDBus::Block, "SetActiveSection", argumentList);
-        if (!reply.isValid())
-        {
-            qWarning() << reply.error();
-            return;
-        }
-    }
-
-Q_SIGNALS:
-    void entryRendererInfoChanged();
-    void globalRendererInfoChanged();
-    void placeEntryInfoChanged();
-};
-#endif

=== removed file 'places/UnityPlaces/unity_place_entry.xml'
--- places/UnityPlaces/unity_place_entry.xml	2010-10-17 03:53:34 +0000
+++ places/UnityPlaces/unity_place_entry.xml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-<interface name="org.freedesktop.DBus.Introspectable">
-  <method name="Introspect">
-    <arg name="data" direction="out" type="s"/>
-  </method>
-</interface>
-
-<interface name="com.canonical.Unity.PlaceEntry">
-  <method name="SetGlobalSearch">
-    <arg name="search" type="s" direction="in"/>
-    <arg name="hints" type="a{ss}" direction="in"/>
-  </method>
-  <method name="SetSearch">
-    <arg name="search" type="s" direction="in"/>
-    <arg name="hints" type="a{ss}" direction="in"/>
-  </method>
-  <method name="SetActive">
-    <arg name="is_active" type="b" direction="in"/>
-  </method>
-  <method name="SetActiveSection">
-    <arg name="section_id" type="u" direction="in"/>
-  </method>
-  <signal name="EntryRendererInfoChanged">
-    <arg name="renderer_info" type="(sssa{ss})"/>
-  </signal>
-  <signal name="GlobalRendererInfoChanged">
-    <arg name="renderer_info" type="(sssa{ss})"/>
-  </signal>
-  <signal name="PlaceEntryInfoChanged">
-    <arg name="entry_info_data" type="(sssuasbsa{ss})"/>
-  </signal>
-</interface>
-</node>
-

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-01-22 03:55:39 +0000
+++ places/app/places.cpp	2011-01-27 16:58:50 +0000
@@ -127,6 +127,8 @@
         /* Place.qml imports UnityApplications, which is part of the launcher
            component… */
         view.engine()->addImportPath(unity2dDirectory() + "/launcher/");
+        /* Place.qml imports Unity2d */
+        view.engine()->addImportPath(unity2dDirectory() + "/libunity-2d/");
     }
 
     /* Load the QML UI, focus and show the window */

=== modified file 'spread/GnomeBackground.qml'
--- spread/GnomeBackground.qml	2011-01-20 04:29:08 +0000
+++ spread/GnomeBackground.qml	2011-01-27 16:58:50 +0000
@@ -1,7 +1,7 @@
 import Qt 4.7
 import gconf 1.0
 /* Necessary to access the blended image provider and CacheEffect */
-import UnityPlaces 1.0
+import Unity2d 1.0
 
 Item {
     property string overlay_color

=== modified file 'spread/Spread.qml'
--- spread/Spread.qml	2011-01-10 13:41:02 +0000
+++ spread/Spread.qml	2011-01-27 16:58:50 +0000
@@ -1,6 +1,6 @@
 import Qt 4.7
 import UnityApplications 1.0
-import UnityPlaces 1.0
+import Unity2d 1.0
 
 /* The main component that manages the spread.
    This only acts as an outer shell, the actual logic is pretty much all in SpreadLayout.qml

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-01-22 03:55:39 +0000
+++ spread/app/spread.cpp	2011-01-27 16:58:50 +0000
@@ -68,9 +68,8 @@
         /* Spread.qml imports UnityApplications, which is part of the launcher
            component */
         view.engine()->addImportPath(unity2dDirectory() + "/launcher/");
-        /* Spread.qml imports UnityPlaces, which is part of the places
-           component */
-        view.engine()->addImportPath(unity2dDirectory() + "/places/");
+        /* Spread.qml imports Unity2d */
+        view.engine()->addImportPath(unity2dDirectory() + "/libunity-2d/");
     }
 
     /* This is needed by GnomeBackground.qml (see explanation in there)