[Pkg-owncloud-commits] [owncloud-client] 88/211: owncloudgui: Fix a small leak

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 2bba4134fbf7f6bd1d258e875a993d80e9b06ef2
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Oct 15 18:11:18 2014 +0200

    owncloudgui: Fix a small leak
    
    The systray icon were not destroyed while qutting
---
 src/mirall/owncloudgui.cpp | 7 +++----
 src/mirall/owncloudgui.h   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 80cb3b4..af9922c 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -50,7 +50,6 @@ ownCloudGui::ownCloudGui(Application *parent) :
     _settingsDialog(new SettingsDialog(this)),
 #endif
     _logBrowser(0),
-    _contextMenu(0),
     _recentActionsMenu(0),
     _folderOpenActionMapper(new QSignalMapper(this)),
     _recentItemsMapper(new QSignalMapper(this)),
@@ -303,11 +302,11 @@ void ownCloudGui::setupContextMenu()
         _recentActionsMenu->addAction(tr("None."));
         _recentActionsMenu->addAction(_actionRecent);
     } else {
-        _contextMenu = new QMenu(_contextMenu);
-        _recentActionsMenu = new QMenu(tr("Recent Changes"));
+        _contextMenu.reset(new QMenu());
+        _recentActionsMenu = new QMenu(tr("Recent Changes"), _contextMenu.data());
         // this must be called only once after creating the context menu, or
         // it will trigger a bug in Ubuntu's SNI bridge patch (11.10, 12.04).
-        _tray->setContextMenu(_contextMenu);
+        _tray->setContextMenu(_contextMenu.data());
     }
     _contextMenu->setTitle(Theme::instance()->appNameGUI() );
     _contextMenu->addAction(_actionOpenoC);
diff --git a/src/mirall/owncloudgui.h b/src/mirall/owncloudgui.h
index c042c23..8d0af8e 100644
--- a/src/mirall/owncloudgui.h
+++ b/src/mirall/owncloudgui.h
@@ -85,7 +85,7 @@ private:
 #endif
     QPointer<LogBrowser>_logBrowser;
        // tray's menu
-    QMenu *_contextMenu;
+    QScopedPointer<QMenu> _contextMenu;
     QMenu *_recentActionsMenu;
 
     QAction *_actionLogin;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git