diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-15 00:06:27 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-15 00:06:27 -0800 |
| commit | 733e4f771063834ef4d8f31af1dcac95d55e3c3e (patch) | |
| tree | 578fc3d3adaff80532f1f0a5a0eced16ebf08e8a /extra/appmenu-qt | |
| parent | a69d072f5cde4b5a6bac62e6022a69d337925e45 (diff) | |
Tue Jan 15 00:06:26 PST 2013
Diffstat (limited to 'extra/appmenu-qt')
| -rw-r--r-- | extra/appmenu-qt/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/appmenu-qt/appmenu-async.diff | 28 |
2 files changed, 31 insertions, 3 deletions
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 27e1208bf..64deb879b 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174631 2013-01-05 12:47:25Z andrea $ +# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64') url='https://launchpad.net/appmenu-qt' @@ -14,7 +14,7 @@ source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${ 'appmenu-async.diff') md5sums=('90cce750e5412d43ce075b0a9bdb6782' 'de499d01369fc85040f5bbfc53ae1700' - '82947207881702d88403c149406b502a') + '5db00ca92274c8b1797c204321961189') build() { # FS#33286 diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff index c4bc509d7..59e3ce791 100644 --- a/extra/appmenu-qt/appmenu-async.diff +++ b/extra/appmenu-qt/appmenu-async.diff @@ -119,3 +119,31 @@ + </interface> +</node> +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-14 16:01:25 +0000 +@@ -410,6 +410,10 @@ + registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + ++ if (!registrar || !registrar->isValid()) { ++ return false; ++ } ++ + Q_FOREACH(QAction *action, m_menuBar->actions()) { + if (!action->isSeparator()) { + m_rootMenu->addAction(action); +@@ -430,9 +434,9 @@ + } + + m_registeredWinId = winId; +- if (registrar) { +- registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); +- } ++ ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ + return true; + } + + |