qtubuntu

Merge lp:~aacid/qtubuntu/aboutToShow into lp:qtubuntu

aboutToShow
Merge into trunk

Proposed by Albert Astals Cid on 2017-03-06

Status:

Merged

Approved by:

Lukáš Tinkl on 2017-03-16

Approved revision:

383

Merged at revision:

379

Proposed branch:

lp:~aacid/qtubuntu/aboutToShow

Merge into:

lp:qtubuntu

Diff against target:

504 lines (+283/-23)

6 files modified

src/ubuntuappmenu/gmenumodelexporter.cpp (+111/-13)
src/ubuntuappmenu/gmenumodelexporter.h (+21/-4)
src/ubuntuappmenu/gmenumodelplatformmenu.cpp (+0/-4)
src/ubuntuappmenu/qtubuntuextraactionhandler.cpp (+107/-0)
src/ubuntuappmenu/qtubuntuextraactionhandler.h (+40/-0)
src/ubuntuappmenu/ubuntuappmenu.pro (+4/-2)

To merge this branch:

bzr merge lp:~aacid/qtubuntu/aboutToShow

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-03-06	Abstain on 2017-03-16
Charles Kerr (community)			Approve on 2017-03-16
Unity8 CI Bot	continuous-integration		Approve on 2017-03-16
Review via email: mp+319080@code.launchpad.net

Commit Message

Set qtubuntu-tag and handle aboutToShow calls

Description of the Change

Silo available at https://bileto.ubuntu.com/#/ticket/2548

Goes together with
https://code.launchpad.net/~aacid/qmenumodel/aboutToShow/+merge/319078
https://code.launchpad.net/~aacid/unity8/aboutToShow/+merge/319079

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/195/rebuild

review: Approve (continuous-integration)

lp:~aacid/qtubuntu/aboutToShow updated on 2017-03-13

381. By Albert Astals Cid on 2017-03-13: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-13:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/201/rebuild

review: Approve (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-03-14:

+ void timerEvent(QTimerEvent *e);

Missing override keyword?

Otherwise the code looks good and does the job

review: Needs Fixing

lp:~aacid/qtubuntu/aboutToShow updated on 2017-03-15

382. By Albert Astals Cid on 2017-03-15: override++

Albert Astals Cid (aacid) wrote on 2017-03-15:

> + void timerEvent(QTimerEvent *e);
>
> Missing override keyword?

Yep, we don't have -Wsuggest-override in qtubuntu

>
>
> Otherwise the code looks good and does the job

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-15:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/205/rebuild

review: Approve (continuous-integration)

Ted Gould (ted) wrote on 2017-03-15:

This looks like it is implementing something similar to the HUD Awareness protocol that Allison wrote for LibreOffice's about-to-show menu generation. Can we use that? U8 will have to support sending the events anyway for LO.

Charles Kerr (charlesk) wrote on 2017-03-15:

I see a Needs Fixing one-liner and a handful of minor/optional suggestions, but looks pretty good overall.

Ted knows more about HUD than me and I can't comment on the question of possible duplication of effort

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2017-03-16:

> This looks like it is implementing something similar to the HUD Awareness
> protocol that Allison wrote for LibreOffice's about-to-show menu generation.
> Can we use that? U8 will have to support sending the events anyway for LO.

If by "the HUD Awareness protocol" you mean https://code.launchpad.net/~desrt/indicator-appmenu/hud-awareness/+merge/127937 I don't see how that would help at all

lp:~aacid/qtubuntu/aboutToShow updated on 2017-03-16

383. By Albert Astals Cid on 2017-03-16: Fix review comments

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/210/rebuild

review: Approve (continuous-integration)

Charles Kerr (charlesk) on 2017-03-16:

review: Approve

Lukáš Tinkl (lukas-kde) on 2017-03-16:

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Daniel d'Andrada

Ubuntu Phablet Team

 === modified file 'src/ubuntuappmenu/gmenumodelexporter.cpp'
 --- src/ubuntuappmenu/gmenumodelexporter.cpp	2016-09-30 08:35:16 +0000
 +++ src/ubuntuappmenu/gmenumodelexporter.cpp	2017-03-16 09:42:42 +0000
@@ -18,8 +18,10 @@
  #include "gmenumodelexporter.h"
  #include "registry.h"
  #include "logging.h"
++#include "qtubuntuextraactionhandler.h"
  #include <QDebug>
++#include <QTimerEvent>
  #include <functional>
@@ -111,6 +113,7 @@
      , m_gactionGroup(g_simple_action_group_new())
      , m_exportedModel(0)
      , m_exportedActions(0)
++    , m_qtubuntuExtraHandler(nullptr)
      , m_menuPath(QStringLiteral(MENU_OBJECT_PATH).arg(s_menuId++))
+ {
      m_structureTimer.setSingleShot(true);
@@ -129,16 +132,57 @@
  // Clear the menu and actions that have been created.
  void UbuntuGMenuModelExporter::clear()
+ {
--    Q_FOREACH(const QMetaObject::Connection& connection, m_propertyConnections) {
--        QObject::disconnect(connection);
++    Q_FOREACH(const QVector<QMetaObject::Connection>& menuPropertyConnections, m_propertyConnections) {
++        Q_FOREACH(const QMetaObject::Connection& connection, menuPropertyConnections) {
++            QObject::disconnect(connection);
++        }
+     }
++    m_propertyConnections.clear();
      g_menu_remove_all(m_gmainMenu);
--    Q_FOREACH(const QByteArray& action, m_actions) {
--        g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), action.constData());
++    Q_FOREACH(const QSet<QByteArray>& menuActions, m_actions) {
++        Q_FOREACH(const QByteArray& action, menuActions) {
++            g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), action.constData());
++        }
+     }
      m_actions.clear();
++
++    m_gmenusForMenus.clear();
++}
++
++void UbuntuGMenuModelExporter::timerEvent(QTimerEvent *e)
++{
++    // Find the menu, it's a very short list
++    auto it = m_reloadMenuTimers.begin();
++    for (; it != m_reloadMenuTimers.end(); ++it) {
++        if (e->timerId() == it.value())
++            break;
++    }
++
++    if (it != m_reloadMenuTimers.end()) {
++        UbuntuPlatformMenu* gplatformMenu = it.key();
++        GMenu *menu = m_gmenusForMenus.value(gplatformMenu);
++        if (menu) {
++            Q_FOREACH(const QMetaObject::Connection& connection, m_propertyConnections[menu]) {
++                QObject::disconnect(connection);
++            }
++            m_propertyConnections.remove(menu);
++            Q_FOREACH(const QByteArray& action, m_actions[menu]) {
++                g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), action.constData());
++            }
++            m_actions.remove(menu);
++            g_menu_remove_all(menu);
++            addSubmenuItems(gplatformMenu, menu);
++        } else {
++            qWarning() << "Got an update timer for a menu that has no GMenu" << gplatformMenu;
++        }
++
++        m_reloadMenuTimers.erase(it);
++    } else {
++        qWarning() << "Got an update timer for a timer that was not running";
++    }
++    killTimer(e->timerId());
+ }
  // Export the model on dbus
@@ -175,6 +219,25 @@
              qCDebug(ubuntuappmenu, "Exported actions on %s", g_dbus_connection_get_unique_name(m_connection));
+         }
+     }
++
++    if (!m_qtubuntuExtraHandler) {
++        m_qtubuntuExtraHandler = new QtUbuntuExtraActionHandler();
++        if (!m_qtubuntuExtraHandler->connect(m_connection, menuPath, this)) {
++            delete m_qtubuntuExtraHandler;
++            m_qtubuntuExtraHandler = nullptr;
++        }
++    }
++}
++
++void UbuntuGMenuModelExporter::aboutToShow(quint64 tag)
++{
++    UbuntuPlatformMenu* gplatformMenu = m_submenusWithTag.value(tag);
++    if (!gplatformMenu) {
++        qWarning() << "Got an aboutToShow call with an unknown tag";
++        return;
++    }
++
++    gplatformMenu->aboutToShow();
+ }
  // Unexport the model
@@ -194,6 +257,11 @@
          g_dbus_connection_unexport_action_group(m_connection, m_exportedActions);
          m_exportedActions = 0;
+     }
++    if (m_qtubuntuExtraHandler) {
++        m_qtubuntuExtraHandler->disconnect(m_connection);
++        delete m_qtubuntuExtraHandler;
++        m_qtubuntuExtraHandler = nullptr;
++    }
      g_object_unref(m_connection);
      m_connection = nullptr;
+ }
@@ -207,6 +275,8 @@
      if (!gplatformMenu) return nullptr;
      GMenu* menu = g_menu_new();
++    m_gmenusForMenus.insert(gplatformMenu, menu);
++
      QByteArray label;
      if (forItem) {
          label = UbuntuPlatformMenuItem::get_text(forItem).toUtf8();
@@ -217,7 +287,32 @@
      addSubmenuItems(gplatformMenu, menu);
      GMenuItem* gmenuItem = g_menu_item_new_submenu(label.constData(), G_MENU_MODEL(menu));
++    const quint64 tag = gplatformMenu->tag();
++    if (tag != 0) {
++        g_menu_item_set_attribute_value(gmenuItem, "qtubuntu-tag", g_variant_new_uint64 (tag));
++        m_submenusWithTag.insert(gplatformMenu->tag(), gplatformMenu);
++    }
      g_object_unref(menu);
++
++    connect(gplatformMenu, &UbuntuPlatformMenu::structureChanged, this, [this, gplatformMenu, menu]
++        {
++            if (!m_reloadMenuTimers.contains(gplatformMenu)) {
++                const int timerId = startTimer(0);
++                m_reloadMenuTimers.insert(gplatformMenu, timerId);
++            }
++        });
++
++    connect(gplatformMenu, &UbuntuPlatformMenu::destroyed, this, [this, tag, gplatformMenu]
++        {
++            m_submenusWithTag.remove(tag);
++            m_gmenusForMenus.remove(gplatformMenu);
++            auto timerIdIt = m_reloadMenuTimers.find(gplatformMenu);
++            if (timerIdIt != m_reloadMenuTimers.end()) {
++                killTimer(*timerIdIt);
++                m_reloadMenuTimers.erase(timerIdIt);
++            }
++        });
++
      return gmenuItem;
+ }
@@ -256,7 +351,7 @@
  // Create and return a gmenu item for the given platform menu item.
  // Returned GMenuItem must be cleaned up using g_object_unref
--GMenuItem *UbuntuGMenuModelExporter::createMenuItem(QPlatformMenuItem *platformMenuItem)
++GMenuItem *UbuntuGMenuModelExporter::createMenuItem(QPlatformMenuItem *platformMenuItem, GMenu *parentMenu)
+ {
      UbuntuPlatformMenuItem* gplatformMenuItem = static_cast<UbuntuPlatformMenuItem*>(platformMenuItem);
      if (!gplatformMenuItem) return nullptr;
@@ -269,7 +364,7 @@
      g_menu_item_set_attribute(gmenuItem, "accel", "s", shortcut.constData());
      g_menu_item_set_detailed_action(gmenuItem, ("unity." + actionLabel).constData());
--    addAction(actionLabel, gplatformMenuItem);
++    addAction(actionLabel, gplatformMenuItem, parentMenu);
      return gmenuItem;
+ }
@@ -294,7 +389,7 @@
      if (!gplatformMenuItem) return;
      GMenuItem* gmenuItem = gplatformMenuItem->menu() ? createSubmenu(gplatformMenuItem->menu(), gplatformMenuItem) :
--                                                       createMenuItem(gplatformMenuItem);
++                                                       createMenuItem(gplatformMenuItem, gmenu);
      if (gmenuItem) {
          g_menu_append_item(gmenu, gmenuItem);
          g_object_unref(gmenuItem);
@@ -302,14 +397,17 @@
+ }
  // Create and add an action for a menu item.
--void UbuntuGMenuModelExporter::addAction(const QByteArray &name, UbuntuPlatformMenuItem *gplatformMenuItem)
++void UbuntuGMenuModelExporter::addAction(const QByteArray &name, UbuntuPlatformMenuItem *gplatformMenuItem, GMenu *parentMenu)
+ {
      disconnect(gplatformMenuItem, &UbuntuPlatformMenuItem::checkedChanged, this, 0);
      disconnect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, this, 0);
--    if (m_actions.contains(name)) {
++    QSet<QByteArray> &actions = m_actions[parentMenu];
++    QVector<QMetaObject::Connection> &propertyConnections = m_propertyConnections[parentMenu];
++
++    if (actions.contains(name)) {
          g_action_map_remove_action(G_ACTION_MAP(m_gactionGroup), name.constData());
--        m_actions.remove(name);
++        actions.remove(name);
+     }
      bool checkable = UbuntuPlatformMenuItem::get_checkable(gplatformMenuItem);
@@ -326,7 +424,7 @@
+             }
          };
          // save the connection to disconnect in UbuntuGMenuModelExporter::clear()
--        m_propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::checkedChanged, this, updateChecked);
++        propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::checkedChanged, this, updateChecked);
      } else {
          action = g_simple_action_new(name.constData(), nullptr);
+     }
@@ -340,11 +438,11 @@
      };
      updateEnabled(UbuntuPlatformMenuItem::get_enabled(gplatformMenuItem));
      // save the connection to disconnect in UbuntuGMenuModelExporter::clear()
--    m_propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, this, updateEnabled);
++    propertyConnections << connect(gplatformMenuItem, &UbuntuPlatformMenuItem::enabledChanged, this, updateEnabled);
      g_signal_connect(action, "activate", G_CALLBACK(activate_cb), gplatformMenuItem);
--    m_actions.insert(name);
++    actions.insert(name);
      g_action_map_add_action(G_ACTION_MAP(m_gactionGroup), G_ACTION(action));
      g_object_unref(action);
+ }
 === modified file 'src/ubuntuappmenu/gmenumodelexporter.h'
 --- src/ubuntuappmenu/gmenumodelexporter.h	2016-09-30 08:35:16 +0000
 +++ src/ubuntuappmenu/gmenumodelexporter.h	2017-03-16 09:42:42 +0000
@@ -22,9 +22,12 @@
  #include <gio/gio.h>
  #include <QTimer>
++#include <QMap>
  #include <QSet>
  #include <QMetaObject>
++class QtUbuntuExtraActionHandler;
++
  // Base class for a gmenumodel exporter
  class UbuntuGMenuModelExporter : public QObject
+ {
@@ -37,30 +40,44 @@
      QString menuPath() const { return m_menuPath;}
++    void aboutToShow(quint64 tag);
++
  protected:
      UbuntuGMenuModelExporter(QObject *parent);
      GMenuItem *createSubmenu(QPlatformMenu* platformMenu, UbuntuPlatformMenuItem* forItem);
--    GMenuItem *createMenuItem(QPlatformMenuItem* platformMenuItem);
++    GMenuItem *createMenuItem(QPlatformMenuItem* platformMenuItem, GMenu *parentMenu);
      GMenuItem *createSection(QList<QPlatformMenuItem*>::const_iterator iter, QList<QPlatformMenuItem*>::const_iterator end);
--    void addAction(const QByteArray& name, UbuntuPlatformMenuItem* gplatformItem);
++    void addAction(const QByteArray& name, UbuntuPlatformMenuItem* gplatformItem, GMenu *parentMenu);
      void addSubmenuItems(UbuntuPlatformMenu* gplatformMenu, GMenu* menu);
      void processItemForGMenu(QPlatformMenuItem* item, GMenu* gmenu);
      void clear();
++    void timerEvent(QTimerEvent *e) override;
++
  protected:
      GDBusConnection *m_connection;
      GMenu *m_gmainMenu;
      GSimpleActionGroup *m_gactionGroup;
--    QSet<QByteArray> m_actions;
      guint m_exportedModel;
      guint m_exportedActions;
++    QtUbuntuExtraActionHandler *m_qtubuntuExtraHandler;
      QTimer m_structureTimer;
      QString m_menuPath;
--    QVector<QMetaObject::Connection> m_propertyConnections;
++    // UbuntuPlatformMenu::tag -> UbuntuPlatformMenu
++    QMap<quint64, UbuntuPlatformMenu*> m_submenusWithTag;
++
++    // UbuntuPlatformMenu -> reload TimerId (startTimer)
++    QHash<UbuntuPlatformMenu*, int> m_reloadMenuTimers;
++
++    QHash<UbuntuPlatformMenu*, GMenu*> m_gmenusForMenus;
++
++    QHash<GMenu*, QSet<QByteArray>> m_actions;
++    QHash<GMenu*, QVector<QMetaObject::Connection>> m_propertyConnections;
++
  };
  // Class which exports a qt platform menu bar.
 === modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.cpp'
 --- src/ubuntuappmenu/gmenumodelplatformmenu.cpp	2017-03-02 09:53:52 +0000
 +++ src/ubuntuappmenu/gmenumodelplatformmenu.cpp	2017-03-16 09:42:42 +0000
@@ -81,8 +81,6 @@
+             }
+         }
+     }
--    connect(static_cast<UbuntuPlatformMenu*>(menu), &UbuntuPlatformMenu::structureChanged,
--            this, &UbuntuPlatformMenuBar::structureChanged);
      Q_EMIT menuInserted(menu);
+ }
@@ -97,8 +95,6 @@
              break;
+         }
+     }
--    disconnect(static_cast<UbuntuPlatformMenu*>(menu), &UbuntuPlatformMenu::structureChanged,
--            this, &UbuntuPlatformMenuBar::structureChanged);
      Q_EMIT menuRemoved(menu);
+ }
 === added file 'src/ubuntuappmenu/qtubuntuextraactionhandler.cpp'
 --- src/ubuntuappmenu/qtubuntuextraactionhandler.cpp	1970-01-01 00:00:00 +0000
 +++ src/ubuntuappmenu/qtubuntuextraactionhandler.cpp	2017-03-16 09:42:42 +0000
@@ -0,0 +1,107 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "qtubuntuextraactionhandler.h"
++
++#include "gmenumodelexporter.h"
++#include "logging.h"
++
++static const gchar introspection_xml[] =
++  "<node>"
++  "  <interface name='qtubuntu.actions.extra'>"
++  "    <method name='aboutToShow'>"
++  "      <arg type='t' name='tag' direction='in'/>"
++  "    </method>"
++  "  </interface>"
++  "</node>";
++
++static void handle_method_call (GDBusConnection       *,
++                                const gchar           *,
++                                const gchar           *,
++                                const gchar           *,
++                                const gchar           *method_name,
++                                GVariant              *parameters,
++                                GDBusMethodInvocation *invocation,
++                                gpointer               user_data)
++{
++
++    if (g_strcmp0 (method_name, "aboutToShow") == 0)
++    {
++        if (g_variant_check_format_string(parameters, "(t)", false)) {
++            auto obj = static_cast<UbuntuGMenuModelExporter*>(user_data);
++            guint64 tag;
++
++            g_variant_get (parameters, "(t)", &tag);
++            obj->aboutToShow(tag);
++        }
++
++        g_dbus_method_invocation_return_value (invocation, NULL);
++    } else {
++        g_dbus_method_invocation_return_error(invocation,
++                                              G_DBUS_ERROR,
++                                              G_DBUS_ERROR_UNKNOWN_METHOD,
++                                              "Unknown method");
++    }
++}
++
++
++static const GDBusInterfaceVTable interface_vtable =
++{
++  handle_method_call,
++  NULL,
++  NULL,
++  NULL
++};
++
++QtUbuntuExtraActionHandler::QtUbuntuExtraActionHandler()
++ : m_registration_id(0)
++{
++    m_introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
++}
++
++QtUbuntuExtraActionHandler::~QtUbuntuExtraActionHandler()
++{
++    g_clear_pointer(&m_introspection_data, g_dbus_node_info_unref);
++}
++
++bool QtUbuntuExtraActionHandler::connect(GDBusConnection *connection, const QByteArray &menuPath, UbuntuGMenuModelExporter *gmenuexporter)
++{
++    if (m_registration_id != 0) {
++        qCWarning(ubuntuappmenu, "Called connect in an already connected QtUbuntuExtraActionHandler");
++        return false;
++    }
++
++    GError *error = nullptr;
++    m_registration_id = g_dbus_connection_register_object (connection, menuPath.constData(),
++                            m_introspection_data->interfaces[0],
++                            &interface_vtable,
++                            gmenuexporter,
++                            nullptr,
++                            &error);
++
++    if (!m_registration_id) {
++        qCWarning(ubuntuappmenu, "Failed to extra actions - %s", error ? error->message : "unknown error");
++        g_clear_error(&error);
++    }
++
++    return m_registration_id != 0;
++}
++
++void QtUbuntuExtraActionHandler::disconnect(GDBusConnection *connection) {
++    if (m_registration_id) {
++        g_dbus_connection_unregister_object (connection, m_registration_id);
++    }
++}
 === added file 'src/ubuntuappmenu/qtubuntuextraactionhandler.h'
 --- src/ubuntuappmenu/qtubuntuextraactionhandler.h	1970-01-01 00:00:00 +0000
 +++ src/ubuntuappmenu/qtubuntuextraactionhandler.h	2017-03-16 09:42:42 +0000
@@ -0,0 +1,40 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, 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 QTUBUNTUEXTRAACTIONHANDLER_H
++#define QTUBUNTUEXTRAACTIONHANDLER_H
++
++#include <gio/gio.h>
++
++class QByteArray;
++
++class UbuntuGMenuModelExporter;
++
++class QtUbuntuExtraActionHandler
++{
++public:
++    QtUbuntuExtraActionHandler();
++    ~QtUbuntuExtraActionHandler();
++
++    bool connect(GDBusConnection *connection, const QByteArray &menuPath, UbuntuGMenuModelExporter *gmenuexporter);
++    void disconnect(GDBusConnection *connection);
++
++private:
++    GDBusNodeInfo *m_introspection_data;
++    guint m_registration_id;
++};
++
++#endif
 === modified file 'src/ubuntuappmenu/ubuntuappmenu.pro'
 --- src/ubuntuappmenu/ubuntuappmenu.pro	2016-06-21 16:33:19 +0000
 +++ src/ubuntuappmenu/ubuntuappmenu.pro	2017-03-16 09:42:42 +0000
@@ -22,7 +22,8 @@
      logging.h \
      menuregistrar.h \
      registry.h \
--    themeplugin.h
++    themeplugin.h \
++    qtubuntuextraactionhandler.h
  SOURCES += \
      theme.cpp \
@@ -30,7 +31,8 @@
      gmenumodelplatformmenu.cpp \
      menuregistrar.cpp \
      registry.cpp \
--    themeplugin.cpp
++    themeplugin.cpp \
++    qtubuntuextraactionhandler.cpp
  OTHER_FILES += \
      ubuntuappmenu.json