[arch-commits] Commit in appmenu-qt/trunk (PKGBUILD appmenu-async.diff)

[Andrea Scarpino]

    Date: Monday, January 14, 2013 @ 12:12:11
  Author: andrea
Revision: 175129

upgpkg: appmenu-qt 0.2.6-3

Update the patch to fix a regression (FS#33391)

Modified:
  appmenu-qt/trunk/PKGBUILD
  appmenu-qt/trunk/appmenu-async.diff

--------------------+
 PKGBUILD           |    4 ++--
 appmenu-async.diff |   28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-14 14:15:23 UTC (rev 175128)
+++ PKGBUILD	2013-01-14 17:12:11 UTC (rev 175129)
@@ -3,7 +3,7 @@
 
 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 @@
         'appmenu-async.diff')
 md5sums=('90cce750e5412d43ce075b0a9bdb6782'
          'de499d01369fc85040f5bbfc53ae1700'
-         '82947207881702d88403c149406b502a')
+         '5db00ca92274c8b1797c204321961189')
 
 build() {
   # FS#33286

Modified: appmenu-async.diff
===================================================================
--- appmenu-async.diff	2013-01-14 14:15:23 UTC (rev 175128)
+++ appmenu-async.diff	2013-01-14 17:12:11 UTC (rev 175129)
@@ -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;
+ }
+ 
+