From 733e4f771063834ef4d8f31af1dcac95d55e3c3e Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 15 Jan 2013 00:06:27 -0800
Subject: Tue Jan 15 00:06:26 PST 2013

---
 extra/appmenu-qt/PKGBUILD           |  6 +++---
 extra/appmenu-qt/appmenu-async.diff | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'extra/appmenu-qt')

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;
+ }
+ 
+
-- 
cgit v1.2.3-54-g00ecf