From ad8ccdad5734bedd2e2e0f45d31f334ba517cdca2300a2a2dbc18bb15e0b7251 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 11 May 2015 20:44:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=21

---
 avoid-shadowing-variable+fix-leak.diff | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/avoid-shadowing-variable+fix-leak.diff b/avoid-shadowing-variable+fix-leak.diff
index 8c06970..4bc5c1e 100644
--- a/avoid-shadowing-variable+fix-leak.diff
+++ b/avoid-shadowing-variable+fix-leak.diff
@@ -1,7 +1,7 @@
 === modified file 'src/dbusmenuimporter.cpp'
 --- src/dbusmenuimporter.cpp	2015-05-05 19:42:58 +0000
 +++ src/dbusmenuimporter.cpp	2015-05-05 19:54:13 +0000
-@@ -553,10 +553,11 @@
+@@ -571,12 +571,13 @@
  
      if (needRefresh || menu->actions().isEmpty()) {
          d->m_idsRefreshedByAboutToShow << id;
@@ -9,7 +9,9 @@
 -        if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {
 +        QDBusPendingCallWatcher *watcher2 = d->refresh(id);
 +        if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) {
+ #ifndef QT_NO_DEBUG
              DMWARNING << "Application did not refresh before timeout";
+ #endif
          }
 +        watcher2->deleteLater();
      }