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

[Aurélien Gâteau]

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)

[Florian Boucault (fboucault)]

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

[Aurélien Gâteau (agateau)]

> 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.

Done. MR is here: https://code.launchpad.net/~agateau/unity-2d/pre-gtk3-work/+merge/68253

[lp:~agateau/unity-2d/gtk3]

639. By Aurélien Gâteau on 2011-07-25

Synced with trunk

Unmerged revisions

639. By Aurélien Gâteau on 2011-07-25

Synced with trunk

638. By Aurélien Gâteau on 2011-07-18

Merged pre-gtk3-work branch

637. By Aurélien Gâteau on 2011-07-13

Merge bring-back-po-files branch

636. By Aurélien Gâteau on 2011-07-13

Use gtk3 version of build-deps

635. By Aurélien Gâteau on 2011-07-13

[buildsystem] Fix detection of indicator3 lib

634. By Aurélien Gâteau on 2011-07-13

[panel] Remove dead code

633. By Aurélien Gâteau on 2011-07-13

[panel] Bring back indicators, using gtk3 version of libindicator

632. By Aurélien Gâteau on 2011-07-13

[libunity-2d] Depend on the GTK3 version of indicators

631. By Aurélien Gâteau on 2011-06-28

[panel] Factorize early setup code and default to QWindowsStyle.

Unity2dApplication::earlySetup() contains all the early setup code.

630. By Aurélien Gâteau on 2011-06-27

[buildsystem] We can't use Unity2dStyle anymore

Unity2dStyle uses QGtkStyle, which uses gtk2. Since we can't mix gtk2 and gtk3,
we must get rid of Unity2dStyle.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-25 14:59:39 +0000
+++ CMakeLists.txt	2011-07-25 14:59:39 +0000
@@ -25,10 +25,10 @@
 find_package(X11 REQUIRED)
 find_package(Gettext REQUIRED)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GDK REQUIRED gdk-2.0)
-pkg_check_modules(GTK REQUIRED gtk+-2.0)
+pkg_check_modules(GDK REQUIRED gdk-3.0)
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
-pkg_check_modules(WNCK REQUIRED libwnck-1.0)
+pkg_check_modules(WNCK REQUIRED libwnck-3.0)
 
 
 # GSettings schemas

=== modified file 'debian/control'
--- debian/control	2011-07-14 14:36:53 +0000
+++ debian/control	2011-07-25 14:59:39 +0000
@@ -10,15 +10,15 @@
                libqt4-dev,
                libqt4-opengl-dev,
                libglib2.0-dev,
-               libwnck-dev,
+               libwnck-3-dev,
                libqtgconf-dev,
                libdconf-qt-dev,
                libqtbamf-dev,
                libqtdee-dev,
                libdbusmenu-qt-dev,
                libx11-dev,
-               libindicator-dev,
-               libgtk2.0-dev,
+               libindicator3-dev,
+               libgtk-3-dev,
                libutouch-geis-dev,
                libstartup-notification0-dev
 Standards-Version: 3.9.1

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-07-25 14:59:39 +0000
+++ launcher/app/launcher.cpp	2011-07-25 14:59:39 +0000
@@ -42,14 +42,11 @@
 #include "unity2dpanel.h"
 #include "gesturehandler.h"
 
-<<<<<<< TREE
-static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
-
-=======
 // libc
 #include <stdlib.h>
 
->>>>>>> MERGE-SOURCE
+static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
+
 #if defined(QMLJSDEBUGGER)
 #include <qt_private/qdeclarativedebughelper_p.h>
 #endif

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-25 14:59:39 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-25 14:59:39 +0000
@@ -4,7 +4,7 @@
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 
 # Sources

=== modified file 'libunity-2d-private/Unity2d/launcherapplication.cpp'
--- libunity-2d-private/Unity2d/launcherapplication.cpp	2011-07-13 17:42:29 +0000
+++ libunity-2d-private/Unity2d/launcherapplication.cpp	2011-07-25 14:59:39 +0000
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Those have to be included before any QObject-style header to avoid
-   compilation errors. */
-#include <gdk/gdk.h>
-
 /* Note regarding the use of wnck: it is critically important that the client
    type be set to pager because wnck will pass that type over to the window
    manager through XEvents.
@@ -59,6 +55,7 @@
 #include <QX11Info>
 
 extern "C" {
+#include <gdk/gdk.h>
 #include <libsn/sn.h>
 }
 
@@ -649,7 +646,8 @@
     GTimeVal timeval;
 
     g_get_current_time (&timeval);
-    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_app_launch_context_new());
+    GdkDisplay* display = gdk_display_get_default();
+    GObjectScopedPointer<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
     /* Using GDK_CURRENT_TIME doesn’t seem to work, launched windows
        sometimes don’t get focus (see https://launchpad.net/bugs/643616). */
     gdk_app_launch_context_set_timestamp(context.data(), timeval.tv_sec);

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-07-14 11:17:30 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-07-25 14:59:39 +0000
@@ -20,10 +20,6 @@
 /* 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 "launcherapplication.h"

=== modified file 'libunity-2d-private/Unity2d/screeninfo.cpp'
--- libunity-2d-private/Unity2d/screeninfo.cpp	2011-06-27 13:43:05 +0000
+++ libunity-2d-private/Unity2d/screeninfo.cpp	2011-07-25 14:59:39 +0000
@@ -1,7 +1,5 @@
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include "bamf-matcher.h"

=== modified file 'libunity-2d-private/Unity2d/windowinfo.cpp'
--- libunity-2d-private/Unity2d/windowinfo.cpp	2011-02-08 11:48:16 +0000
+++ libunity-2d-private/Unity2d/windowinfo.cpp	2011-07-25 14:59:39 +0000
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 
 #include <glib-2.0/glib.h>
 

=== modified file 'libunity-2d-private/Unity2d/workspacesinfo.cpp'
--- libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-07-23 12:46:30 +0000
+++ libunity-2d-private/Unity2d/workspacesinfo.cpp	2011-07-25 14:59:39 +0000
@@ -4,9 +4,7 @@
 #include <debug_p.h>
 
 extern "C" {
-#include <libwnck/screen.h>
-#include <libwnck/window.h>
-#include <libwnck/workspace.h>
+#include <libwnck/libwnck.h>
 }
 
 #include <QAbstractEventDispatcher>

=== modified file 'panel/app/CMakeLists.txt'
--- panel/app/CMakeLists.txt	2011-04-04 16:41:15 +0000
+++ panel/app/CMakeLists.txt	2011-07-25 14:59:39 +0000
@@ -1,7 +1,6 @@
 set(panel_SRCS
     main.cpp
     panelmanager.cpp
-    unity2dstyle.cpp
     )
 
 qt4_automoc(${panel_SRCS})
@@ -10,6 +9,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GTK_INCLUDE_DIRS}
     ${uqapplets_SOURCE_DIR}
     ${uqapplets_SOURCE_DIR}/common
     ${libunity-2d-private_SOURCE_DIR}/src
@@ -18,6 +18,7 @@
 target_link_libraries(unity-2d-panel
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
+    ${GTK_LDFLAGS}
     uqapplets
     unity-2d-private
     )

=== modified file 'panel/app/main.cpp'
--- panel/app/main.cpp	2011-07-25 14:59:39 +0000
+++ panel/app/main.cpp	2011-07-25 14:59:39 +0000
@@ -27,7 +27,6 @@
 #include <gnomesessionclient.h>
 #include <unity2ddebug.h>
 #include <unity2dapplication.h>
-#include <unity2dstyle.h>
 #include <unity2dtr.h>
 
 // Qt
@@ -54,7 +53,6 @@
     ThemeEngineHandler handler;
     Unity2dApplication::earlySetup(argc, argv);
     Unity2dApplication app(argc, argv);
-    QApplication::setStyle(new Unity2dStyle);
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-panel.desktop");
     client.connectToSessionManager();

=== removed file 'panel/app/unity2dstyle.cpp'
--- panel/app/unity2dstyle.cpp	2011-03-28 12:16:02 +0000
+++ panel/app/unity2dstyle.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/*
- * Plasma applet to display DBus global menu
- *
- * Copyright 2009 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/>
- */
-
-// Self
-#include "unity2dstyle.h"
-
-// Local
-
-// libunity-2d-private
-#include <debug_p.h>
-#include <keyboardmodifiersmonitor.h>
-
-// Qt
-#include <QGtkStyle>
-#include <QMenu>
-#include <QPainter>
-#include <QStyleOptionFrame>
-#include <QWidget>
-
-Unity2dStyle::Unity2dStyle()
-: QProxyStyle(new QGtkStyle)
-{
-}
-
-void Unity2dStyle::drawControl(QStyle::ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget) const
-{
-    if (element == QStyle::CE_MenuBarItem && widget) {
-        QStyleOptionMenuItem opt = *qstyleoption_cast<const QStyleOptionMenuItem*>(option);
-        if (!(opt.state & QStyle::State_Enabled) && (opt.state & QStyle::State_Sunken)) {
-            // Reset State_Sunken flag to avoid drawing a frame on a disabled menu item
-            // See https://bugs.launchpad.net/unity-2d/+bug/717744
-            opt.state ^= QStyle::State_Sunken;
-        }
-        // Skip "widget" parameter to avoid solid gray background behind the menubar items
-        QProxyStyle::drawControl(element, &opt, painter, 0);
-    } else if (element == QStyle::CE_MenuBarEmptyArea) {
-        // Avoid gray borders around the menubar items
-    } else {
-        QProxyStyle::drawControl(element, option, painter, widget);
-    }
-}
-
-int Unity2dStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option, const QWidget* widget) const
-{
-    if (metric == QStyle::PM_MenuBarVMargin) {
-        // Avoid one-pixel gap above menuitem
-        return 0;
-    } else {
-        return QProxyStyle::pixelMetric(metric, option, widget);
-    }
-}
-
-QSize Unity2dStyle::sizeFromContents(QStyle::ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget) const
-{
-    QSize size = QProxyStyle::sizeFromContents(type, option, contentsSize, widget);
-    if (type == QStyle::CT_MenuBarItem && widget) {
-        // Avoid three-pixel gap below menuitem
-        size.setHeight(widget->height());
-    }
-    return size;
-}
-
-int Unity2dStyle::styleHint(StyleHint hint, const QStyleOption* option, const QWidget* widget, QStyleHintReturn* returnData) const
-{
-    if (hint == QStyle::SH_UnderlineShortcut) {
-        // The shortcut of an opened menu can be triggered without holding Alt
-        // down, so we always show the underline. For all other widgets we only
-        // show the underlines if alt is down.
-        // Note that this is a bit hackish: it only works reliably if the
-        // widget repaints itself when alt is pressed or released. For now only
-        // the MenuBarWidget from the AppNameApplets does this.
-        if (qobject_cast<const QMenu*>(widget)) {
-            return true;
-        } else {
-            return KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier;
-        }
-    } else {
-        return QProxyStyle::styleHint(hint, option, widget, returnData);
-    }
-}

=== removed file 'panel/app/unity2dstyle.h'
--- panel/app/unity2dstyle.h	2011-01-26 15:50:26 +0000
+++ panel/app/unity2dstyle.h	1970-01-01 00:00:00 +0000
@@ -1,44 +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/>
- */
-
-#ifndef UNITY2DSTYLE_H
-#define UNITY2DSTYLE_H
-
-// Local
-
-// Qt
-#include <QProxyStyle>
-
-class Unity2dStyle : public QProxyStyle
-{
-public:
-    Unity2dStyle();
-
-    virtual void drawControl(ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget = 0) const;
-
-    virtual int pixelMetric(PixelMetric metric, const QStyleOption* option = 0, const QWidget* widget = 0) const;
-
-    virtual QSize sizeFromContents(ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget = 0) const;
-
-    virtual int styleHint(StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const;
-};
-
-#endif /* UNITY2DSTYLE_H */

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-07-25 14:59:39 +0000
+++ panel/applets/CMakeLists.txt	2011-07-25 14:59:39 +0000
@@ -14,11 +14,11 @@
 
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
 
 # Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
+read_pkg_variable(INDICATOR_DIR       indicator3 indicatordir)
+read_pkg_variable(INDICATOR_ICONS_DIR indicator3 iconsdir)
 configure_file(indicator-config.h.in indicator-config.h)
 
 # Sources
@@ -32,10 +32,7 @@
     common/applet.cpp
     homebutton/homebuttonapplet.cpp
     homebutton/homebutton.cpp
-    indicator/abstractindicator.cpp
-    indicator/datetimeindicator.cpp
     indicator/indicatorapplet.cpp
-    indicator/indicatorservicemanager.cpp
     indicator/indicator.c
     legacytray/legacytrayapplet.cpp
     legacytray/fdoselectionmanager.cpp

=== removed file 'panel/applets/indicator/abstractindicator.cpp'
--- panel/applets/indicator/abstractindicator.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/abstractindicator.cpp	1970-01-01 00:00:00 +0000
@@ -1,43 +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/>.
- */
-
-// Self
-#include "abstractindicator.h"
-
-// Local
-
-// Qt
-#include <QAction>
-
-AbstractIndicator::AbstractIndicator(QObject* parent)
-: QObject(parent)
-{
-}
-
-AbstractIndicator::~AbstractIndicator()
-{
-}
-
-void AbstractIndicator::init()
-{
-}
-
-#include "abstractindicator.moc"

=== removed file 'panel/applets/indicator/abstractindicator.h'
--- panel/applets/indicator/abstractindicator.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/abstractindicator.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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/>.
- */
-
-#ifndef ABSTRACTINDICATOR_H
-#define ABSTRACTINDICATOR_H
-
-// Local
-
-// Qt
-#include <QObject>
-
-class QAction;
-
-class AbstractIndicator : public QObject
-{
-    Q_OBJECT
-public:
-    AbstractIndicator(QObject* parent=0);
-    ~AbstractIndicator();
-
-    /**
-     * Called when the indicator has been constructed and its owner is connected to signals.
-     * It's the right place to emit actionAdded()
-     */
-    virtual void init();
-
-Q_SIGNALS:
-    void actionAdded(QAction*);
-    void actionRemoved(QAction*);
-
-private:
-    Q_DISABLE_COPY(AbstractIndicator)
-};
-
-#endif /* ABSTRACTINDICATOR_H */

=== removed file 'panel/applets/indicator/datetimeindicator.cpp'
--- panel/applets/indicator/datetimeindicator.cpp	2011-02-10 01:10:19 +0000
+++ panel/applets/indicator/datetimeindicator.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +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/>.
- */
-
-// Self
-#include "datetimeindicator.h"
-
-// Local
-#include "indicatorservicemanager.h"
-
-// dbusmenu-qt
-#include "dbusmenuimporter.h"
-
-// Qt
-#include <QAction>
-#include <QDateTime>
-
-// From dbus-shared.h
-#define  SERVICE_NAME     "com.canonical.indicator.datetime"
-#define  SERVICE_IFACE    "com.canonical.indicator.datetime.service"
-#define  SERVICE_OBJ      "/com.canonical/indicator/datetime/service"
-#define  SERVICE_VERSION  1
-
-#define  MENU_OBJ      "/com.canonical/indicator/datetime/menu"
-
-#define  DBUSMENU_CALENDAR_MENUITEM_TYPE "x-canonical-calendar-item"
-////
-
-DateTimeIndicator::DateTimeIndicator(QObject* parent)
-: AbstractIndicator(parent)
-, m_action(new QAction(this))
-, m_timer(new QTimer(this))
-{
-    new IndicatorServiceManager(SERVICE_NAME, SERVICE_VERSION, this);
-
-    readConfig();
-    setupMenu();
-    setupTimer();
-    updateText();
-}
-
-void DateTimeIndicator::init()
-{
-    actionAdded(m_action);
-}
-
-void DateTimeIndicator::setupMenu()
-{
-    DBusMenuImporter* importer = new DBusMenuImporter(SERVICE_NAME, MENU_OBJ, this);
-    m_action->setMenu(importer->menu());
-}
-
-void DateTimeIndicator::setupTimer()
-{
-    m_timer->setSingleShot(false);
-    connect(m_timer, SIGNAL(timeout()), SLOT(updateText()));
-    updateTimer();
-    m_timer->start();
-}
-
-void DateTimeIndicator::updateTimer()
-{
-    m_timer->setInterval(1000);
-}
-
-void DateTimeIndicator::updateText()
-{
-    QString text = QDateTime::currentDateTime().toString(m_format);
-    m_action->setText(text);
-}
-
-void DateTimeIndicator::readConfig()
-{
-    m_format = "hh:mm:ss";
-}
-
-#include "datetimeindicator.moc"

=== removed file 'panel/applets/indicator/datetimeindicator.h'
--- panel/applets/indicator/datetimeindicator.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/datetimeindicator.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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/>.
- */
-
-#ifndef DATETIMEINDICATOR_H
-#define DATETIMEINDICATOR_H
-
-// Local
-#include "abstractindicator.h"
-
-// Qt
-#include <QTimer>
-
-class DateTimeIndicator : public AbstractIndicator
-{
-    Q_OBJECT
-public:
-    DateTimeIndicator(QObject* parent=0);
-
-    virtual void init();
-
-private Q_SLOTS:
-    void updateText();
-private:
-    Q_DISABLE_COPY(DateTimeIndicator)
-    QAction* m_action;
-    QTimer* m_timer;
-    QString m_format;
-
-    void setupTimer();
-    void setupMenu();
-    void readConfig();
-    void updateTimer();
-};
-
-#endif /* DATETIMEINDICATOR_H */

=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-07-01 03:58:28 +0000
+++ panel/applets/indicator/indicator.c	2011-07-25 14:59:39 +0000
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include <libindicator/indicator-object.h>
 
 #include "indicator.h"
@@ -439,7 +440,7 @@
   
   /* Build menu */
   indicator->menu = gtk_menu_bar_new();
-  GTK_WIDGET_SET_FLAGS (indicator->menu, GTK_WIDGET_FLAGS(indicator->menu) | GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(GTK_WIDGET (indicator->menu), TRUE);
   gtk_widget_set_name(GTK_WIDGET (indicator->menu), "indicator-applet-menubar");
   g_signal_connect(indicator->menu, "button-press-event", G_CALLBACK(on_menu_press), NULL);
   //g_signal_connect_after(indicator->menu, "expose-event", G_CALLBACK(menu_on_expose), menu);

=== modified file 'panel/applets/indicator/indicatorapplet.cpp'
--- panel/applets/indicator/indicatorapplet.cpp	2011-06-22 14:49:34 +0000
+++ panel/applets/indicator/indicatorapplet.cpp	2011-07-25 14:59:39 +0000
@@ -23,26 +23,21 @@
 #include "indicatorapplet.h"
 
 // Local
-#include "abstractindicator.h"
-#include "datetimeindicator.h"
 #include "debug_p.h"
 #include "indicator.h"
 
 // Qt
-#include <QAction>
-#include <QDBusConnection>
 #include <QHBoxLayout>
-#include <QMenu>
+#include <QTimer>
 #include <QX11EmbedContainer>
 
 // Gtk
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 
 IndicatorApplet::IndicatorApplet()
 {
     setupUi();
-    loadIndicators();
 }
 
 void IndicatorApplet::setupUi()
@@ -58,10 +53,6 @@
 
 void IndicatorApplet::createGtkIndicator()
 {
-    int* argc = 0;
-    char*** argv = 0;
-    gtk_init(argc, argv);
-
     m_container = new QX11EmbedContainer;
     layout()->addWidget(m_container);
 
@@ -78,37 +69,9 @@
 
 void IndicatorApplet::adjustGtkIndicatorSize()
 {
-    GtkRequisition requisition;
-    gtk_widget_size_request(m_gtkIndicator->menu, &requisition);
-    m_container->setFixedWidth(requisition.width);
-}
-
-void IndicatorApplet::loadIndicators()
-{
-#if 0
-    // FIXME: Using Qt plugins
-    QList<AbstractIndicator*> indicators = QList<AbstractIndicator*>()
-        << new DateTimeIndicator(this)
-        ;
-
-    Q_FOREACH(AbstractIndicator* indicator, indicators) {
-        connect(indicator, SIGNAL(actionAdded(QAction*)), SLOT(slotActionAdded(QAction*)));
-        connect(indicator, SIGNAL(actionRemoved(QAction*)), SLOT(slotActionRemoved(QAction*)));
-        indicator->init();
-    }
-#endif
-}
-
-void IndicatorApplet::slotActionAdded(QAction* action)
-{
-    UQ_VAR(action->text());
-    m_menuBar->addAction(action);
-}
-
-void IndicatorApplet::slotActionRemoved(QAction* action)
-{
-    m_menuBar->removeAction(action);
-}
-
+    GtkRequisition minimum, natural;
+    gtk_widget_get_preferred_size(m_gtkIndicator->menu, &minimum, &natural);
+    m_container->setFixedWidth(minimum.width);
+}
 
 #include "indicatorapplet.moc"

=== modified file 'panel/applets/indicator/indicatorapplet.h'
--- panel/applets/indicator/indicatorapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/indicatorapplet.h	2011-07-25 14:59:39 +0000
@@ -40,9 +40,6 @@
     IndicatorApplet();
 
 private Q_SLOTS:
-    void loadIndicators();
-    void slotActionAdded(QAction*);
-    void slotActionRemoved(QAction*);
     void createGtkIndicator();
     void adjustGtkIndicatorSize();
 

=== removed file 'panel/applets/indicator/indicatorservicemanager.cpp'
--- panel/applets/indicator/indicatorservicemanager.cpp	2011-02-10 01:10:19 +0000
+++ panel/applets/indicator/indicatorservicemanager.cpp	1970-01-01 00:00:00 +0000
@@ -1,120 +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/>.
- */
-
-// Self
-#include "indicatorservicemanager.h"
-
-// Local
-#include "debug_p.h"
-
-// Qt
-#include <QAction>
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QDBusMessage>
-#include <QDBusServiceWatcher>
-#include <QDBusReply>
-#include <QDBusInterface>
-
-static const char* INDICATOR_SERVICE_INTERFACE = "com.canonical.indicator.service";
-static const char* INDICATOR_SERVICE_OBJECT    = "/com.canonical/indicator/service";
-static const uint  INDICATOR_SERVICE_VERSION   = 1;
-
-IndicatorServiceManager::IndicatorServiceManager(const char* name, uint version, QObject* parent)
-: QObject(parent)
-, m_serviceName(name)
-, m_serviceVersion(version)
-{
-    QDBusServiceWatcher* serviceWatcher = new QDBusServiceWatcher(this);
-    serviceWatcher->setConnection(QDBusConnection::sessionBus());
-    serviceWatcher->addWatchedService(m_serviceName);
-    connect(serviceWatcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-        SLOT(slotServiceOwnerChanged(QString, QString, QString)));
-    connectToService();
-}
-
-IndicatorServiceManager::~IndicatorServiceManager()
-{
-    unwatchService();
-}
-
-void IndicatorServiceManager::connectToService()
-{
-    QDBusConnectionInterface* iface = QDBusConnection::sessionBus().interface();
-    QDBusReply<bool> reply = iface->isServiceRegistered(m_serviceName);
-    UQ_RETURN_IF_FAIL(reply.isValid());
-
-    if (reply.value()) {
-        watchService();
-    } else {
-        QDBusReply<void> reply = iface->startService(m_serviceName);
-        if (!reply.isValid()) {
-            UQ_WARNING << reply.error().message();
-        }
-    }
-}
-
-void IndicatorServiceManager::watchService()
-{
-    QDBusInterface iface(m_serviceName, INDICATOR_SERVICE_OBJECT, INDICATOR_SERVICE_INTERFACE);
-    QDBusPendingCall pending = iface.asyncCall("Watch");
-    QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(pending, this);
-    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), SLOT(slotWatchFinished(QDBusPendingCallWatcher*)));
-}
-
-void IndicatorServiceManager::slotWatchFinished(QDBusPendingCallWatcher* watcher)
-{
-    QDBusMessage message = watcher->reply();
-    delete watcher;
-    UQ_RETURN_IF_FAIL(message.type() == QDBusMessage::ReplyMessage);
-    QVariantList args = message.arguments();
-    UQ_RETURN_IF_FAIL(args.count() == 2);
-
-    uint apiVersion = args.at(0).toUInt();
-    uint serviceVersion = args.at(1).toUInt();
-
-    if (apiVersion != INDICATOR_SERVICE_VERSION) {
-        UQ_WARNING << "Expected api version=" << INDICATOR_SERVICE_VERSION << "got" << apiVersion << "instead";
-        unwatchService();
-        return;
-    }
-    if (serviceVersion != m_serviceVersion) {
-        UQ_WARNING << "Expected service version=" << m_serviceVersion << "got" << serviceVersion << "instead";
-        unwatchService();
-    }
-}
-
-void IndicatorServiceManager::unwatchService()
-{
-    QDBusInterface iface(m_serviceName, INDICATOR_SERVICE_OBJECT, INDICATOR_SERVICE_INTERFACE);
-    iface.asyncCall("Unwatch");
-}
-
-void IndicatorServiceManager::slotServiceOwnerChanged(const QString& /*name*/, const QString& /*oldOwner*/, const QString& newOwner)
-{
-    if (newOwner.isNull()) {
-        // FIXME: Respawn
-    } else {
-        watchService();
-    }
-}
-
-#include "indicatorservicemanager.moc"

=== removed file 'panel/applets/indicator/indicatorservicemanager.h'
--- panel/applets/indicator/indicatorservicemanager.h	2011-01-15 01:41:03 +0000
+++ panel/applets/indicator/indicatorservicemanager.h	1970-01-01 00:00:00 +0000
@@ -1,54 +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/>.
- */
-
-#ifndef INDICATORSERVICEMANAGER_H
-#define INDICATORSERVICEMANAGER_H
-
-// Local
-
-// Qt
-#include <QObject>
-
-class QAction;
-class QDBusPendingCallWatcher;
-
-class IndicatorServiceManager : public QObject
-{
-    Q_OBJECT
-public:
-    IndicatorServiceManager(const char* name, uint version, QObject* parent=0);
-    ~IndicatorServiceManager();
-
-private Q_SLOTS:
-    void slotServiceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner);
-    void slotWatchFinished(QDBusPendingCallWatcher*);
-
-private:
-    Q_DISABLE_COPY(IndicatorServiceManager)
-    QString m_serviceName;
-    uint m_serviceVersion;
-
-    void connectToService();
-    void watchService();
-    void unwatchService();
-};
-
-#endif /* INDICATORSERVICEMANAGER_H */