libdbusmenu-qt

Merge lp:~david.edmundson/libdbusmenu-qt/libdbusmenu-qt into lp:libdbusmenu-qt

  1. libdbusmenu-qt
  2. Merge into trunk
Proposed by David Edmundson
Status: Merged
Approved by: Pete Woods
Approved revision: 269
Merged at revision: 268
Proposed branch: lp:~david.edmundson/libdbusmenu-qt/libdbusmenu-qt
Merge into: lp:libdbusmenu-qt
Diff against target: 30 lines (+4/-2)
1 file modified
src/dbusmenuimporter.cpp (+4/-2)
To merge this branch: bzr merge lp:~david.edmundson/libdbusmenu-qt/libdbusmenu-qt
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+258306@code.launchpad.net

Commit message

fix leaks

Description of the change

fix leaks

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-qt-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good to me.

review: Approve
Revision history for this message
David Edmundson (david.edmundson) wrote :

How do I now merge the branch? I don't think I have permissions.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Pete will handle it next week

Revision history for this message
David Edmundson (david.edmundson) wrote :

Perfect, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/dbusmenuimporter.cpp'
--- src/dbusmenuimporter.cpp 2014-03-05 09:53:39 +0000
+++ src/dbusmenuimporter.cpp 2015-05-21 14:53:26 +0000
@@ -433,6 +433,7 @@
433void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)433void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
434{434{
435 int parentId = watcher->property(DBUSMENU_PROPERTY_ID).toInt();435 int parentId = watcher->property(DBUSMENU_PROPERTY_ID).toInt();
436 watcher->deleteLater();
436437
437 QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;438 QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
438 if (!reply.isValid()) {439 if (!reply.isValid()) {
@@ -538,6 +539,7 @@
538void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *watcher)539void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *watcher)
539{540{
540 int id = watcher->property(DBUSMENU_PROPERTY_ID).toInt();541 int id = watcher->property(DBUSMENU_PROPERTY_ID).toInt();
542 watcher->deleteLater();
541543
542 QDBusPendingReply<bool> reply = *watcher;544 QDBusPendingReply<bool> reply = *watcher;
543 if (reply.isError()) {545 if (reply.isError()) {
@@ -551,8 +553,8 @@
551553
552 if (needRefresh || menu->actions().isEmpty()) {554 if (needRefresh || menu->actions().isEmpty()) {
553 d->m_idsRefreshedByAboutToShow << id;555 d->m_idsRefreshedByAboutToShow << id;
554 watcher = d->refresh(id);556 QDBusPendingCallWatcher *watcher2 = d->refresh(id);
555 if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {557 if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) {
556 DMWARNING << "Application did not refresh before timeout";558 DMWARNING << "Application did not refresh before timeout";
557 }559 }
558 }560 }

Subscribers

People subscribed via source and target branches