unity-2d

Merge lp://qastaging/~agateau/unity-2d/gtk3 into lp://qastaging/unity-2d/3.0

gtk3
Merge into natty

Proposed by Aurélien Gâteau on 2011-07-25

Status:	Rejected
Rejected by:	Florian Boucault on 2011-07-27
Proposed branch:	lp://qastaging/~agateau/unity-2d/gtk3
Merge into:	lp://qastaging/unity-2d/3.0
Prerequisite:	lp://qastaging/~agateau/unity-2d/pre-gtk3-work
Diff against target:	963 lines (+28/-645) 23 files modified CMakeLists.txt (+3/-3) debian/control (+3/-3) launcher/app/launcher.cpp (+2/-5) libunity-2d-private/Unity2d/CMakeLists.txt (+1/-1) libunity-2d-private/Unity2d/launcherapplication.cpp (+3/-5) libunity-2d-private/Unity2d/plugin.cpp (+0/-4) libunity-2d-private/Unity2d/screeninfo.cpp (+1/-3) libunity-2d-private/Unity2d/windowinfo.cpp (+1/-3) libunity-2d-private/Unity2d/workspacesinfo.cpp (+1/-3) panel/app/CMakeLists.txt (+2/-1) panel/app/main.cpp (+0/-2) panel/app/unity2dstyle.cpp (+0/-98) panel/app/unity2dstyle.h (+0/-44) panel/applets/CMakeLists.txt (+3/-6) panel/applets/indicator/abstractindicator.cpp (+0/-43) panel/applets/indicator/abstractindicator.h (+0/-53) panel/applets/indicator/datetimeindicator.cpp (+0/-94) panel/applets/indicator/datetimeindicator.h (+0/-53) panel/applets/indicator/indicator.c (+2/-1) panel/applets/indicator/indicatorapplet.cpp (+6/-43) panel/applets/indicator/indicatorapplet.h (+0/-3) panel/applets/indicator/indicatorservicemanager.cpp (+0/-120) panel/applets/indicator/indicatorservicemanager.h (+0/-54)
To merge this branch:	bzr merge lp://qastaging/~agateau/unity-2d/gtk3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Florian Boucault		2011-07-25	Pending
Review via email: mp+69099@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-07-13.

Description of the change

This branch has been extracted from the unity-core branch. It ports all GTK code from GTK2 to GTK3.

We can't use QGtkStyle anymore because it links to GTK2. Therefore we have to initialize GTK ourself. To ensure this is done consistently, I introduced Unity2dApplication::earlySetup(). This method is called by all main() functions. It initializes GTK and does other initialization tasks like setting up our debug handlers or adjusting the graphic system.

(Resubmitted to make pre-gtk3-work as prerequisite branch)

Revision history for this message

Florian Boucault (fboucault) wrote on 2011-07-14: Posted in a previous version of this proposal

This MR contains changes that are completely compatible with Natty. For example the changes in the following files (creation of earlySetup):

spread/app/spread.cpp
spread/app/CMakeLists.txt
places/app/places.cpp
places/app/CMakeLists.txt
launcher/app/launcher.cpp

Please extract as much as possible as to minimize the delta.

review: Needs Fixing

Revision history for this message

Aurélien Gâteau (agateau) wrote on 2011-07-18: Posted in a previous version of this proposal

> This MR contains changes that are completely compatible with Natty. For
> example the changes in the following files (creation of earlySetup):
>
> spread/app/spread.cpp
> spread/app/CMakeLists.txt
> places/app/places.cpp
> places/app/CMakeLists.txt
> launcher/app/launcher.cpp
>
>
> Please extract as much as possible as to minimize the delta.