From 6d8d26d0dc8b7c48dc494b25c4c8ee721125378b Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Mon, 30 Jun 2014 18:42:42 +0100 Subject: unset actions model in destructor --- libqmenumodel/src/unitymenuaction.cpp | 10 +++------- libqmenumodel/src/unitymenumodel.cpp | 11 +++++++++++ tests/client/CMakeLists.txt | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libqmenumodel/src/unitymenuaction.cpp b/libqmenumodel/src/unitymenuaction.cpp index 46edf16..5de3cf8 100644 --- a/libqmenumodel/src/unitymenuaction.cpp +++ b/libqmenumodel/src/unitymenuaction.cpp @@ -33,9 +33,7 @@ UnityMenuAction::UnityMenuAction(QObject* parent) UnityMenuAction::~UnityMenuAction() { - if (m_model) { - m_model->unregisterAction(this); - } + unregisterAction(); } QString UnityMenuAction::name() const @@ -59,9 +57,7 @@ UnityMenuModel* UnityMenuAction::model() const void UnityMenuAction::setModel(UnityMenuModel* model) { if (m_model != model) { - if (!model) { - unregisterAction(); - } + unregisterAction(); m_model = model; registerAction(); Q_EMIT modelChanged(model); @@ -107,7 +103,7 @@ void UnityMenuAction::setValid(bool valid) } } -int UnityMenuAction::index() const +int UnityMenuAction::index() const { return m_index; } diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index 8db990b..a6ae140 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -79,6 +79,7 @@ public: QHash roles; ActionStateParser* actionStateParser; QHash registeredActions; + bool destructorGuard; static void nameAppeared(GDBusConnection *connection, const gchar *name, const gchar *owner, gpointer user_data); static void nameVanished(GDBusConnection *connection, const gchar *name, gpointer user_data); @@ -113,6 +114,7 @@ UnityMenuModelPrivate::UnityMenuModelPrivate(UnityMenuModel *model) this->connection = NULL; this->nameWatchId = 0; this->actionStateParser = new ActionStateParser(model); + this->destructorGuard = false; this->muxer = gtk_action_muxer_new (); @@ -126,6 +128,7 @@ UnityMenuModelPrivate::UnityMenuModelPrivate(const UnityMenuModelPrivate& other, this->connection = NULL; this->nameWatchId = 0; this->actionStateParser = new ActionStateParser(model); + this->destructorGuard = false; this->muxer = GTK_ACTION_MUXER( g_object_ref(other.muxer)); @@ -134,6 +137,7 @@ UnityMenuModelPrivate::UnityMenuModelPrivate(const UnityMenuModelPrivate& other, UnityMenuModelPrivate::~UnityMenuModelPrivate() { + this->destructorGuard = true; this->clearItems(false); g_sequence_free(this->items); @@ -144,6 +148,7 @@ UnityMenuModelPrivate::~UnityMenuModelPrivate() QHash::const_iterator it = this->registeredActions.constBegin(); for (; it != this->registeredActions.constEnd(); ++it) { g_object_unref(it.value()); + it.key()->setModel(NULL); } this->registeredActions.clear(); @@ -787,6 +792,9 @@ bool UnityMenuModel::event(QEvent* e) void UnityMenuModel::registerAction(UnityMenuAction* action) { + if (priv->destructorGuard) + return; + if (!priv->registeredActions.contains(action)) { GtkSimpleActionObserver* observer_item; observer_item = gtk_simple_action_observer_new(GTK_ACTION_OBSERVABLE (priv->muxer), @@ -808,6 +816,9 @@ void UnityMenuModel::registerAction(UnityMenuAction* action) void UnityMenuModel::unregisterAction(UnityMenuAction* action) { + if (priv->destructorGuard) + return; + if (priv->registeredActions.contains(action)) { GtkSimpleActionObserver* observer_item; observer_item = priv->registeredActions[action]; diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index cb16fc0..ed2f1aa 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -60,6 +60,7 @@ declare_test(qmltest) declare_test(convertertest) declare_test(modelsignalstest) declare_test(treetest) +declare_test(unitymenuactiontest) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmlfiles.h.in ${CMAKE_CURRENT_BINARY_DIR}/qmlfiles.h) -- cgit v1.2.3 From 99e2882b2fbf0f5e50981a80ffcaa2c857e2f70f Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 1 Jul 2014 08:05:23 +0100 Subject: added missing file --- tests/client/unitymenuactiontest.cpp | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 tests/client/unitymenuactiontest.cpp diff --git a/tests/client/unitymenuactiontest.cpp b/tests/client/unitymenuactiontest.cpp new file mode 100644 index 0000000..9134930 --- /dev/null +++ b/tests/client/unitymenuactiontest.cpp @@ -0,0 +1,62 @@ +/* + * Copyright 2012 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Authors: + * Renato Araujo Oliveira Filho + */ + +#include "unitymenumodel.h" +#include "unitymenuaction.h" + +#include +#include + +class UnityMenuActionTest : public QObject +{ + Q_OBJECT +private: + +private Q_SLOTS: + + /* + * Test if the propety busType handle correct integer values + */ + void testDestroyAfterModel() + { + UnityMenuModel* model = new UnityMenuModel; + UnityMenuAction* action = new UnityMenuAction; + action->setModel(model); + + delete model; + delete action; + } + + /* + * Test if the propety busType handle correct integer values + */ + void testDestroyBeforeModel() + { + UnityMenuModel* model = new UnityMenuModel; + UnityMenuAction* action = new UnityMenuAction; + action->setModel(model); + + delete action; + delete model; + } +}; + +QTEST_MAIN(UnityMenuActionTest) + +#include "unitymenuactiontest.moc" -- cgit v1.2.3 From 4f4fde02f90abeb1d20a842b2a7578a84fe75f51 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 1 Jul 2014 11:17:23 +0100 Subject: fixed copywrite --- tests/client/unitymenuactiontest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/client/unitymenuactiontest.cpp b/tests/client/unitymenuactiontest.cpp index 9134930..d33ab2e 100644 --- a/tests/client/unitymenuactiontest.cpp +++ b/tests/client/unitymenuactiontest.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2012 Canonical Ltd. + * Copyright 2014 Canonical Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -14,7 +14,7 @@ * along with this program. If not, see . * * Authors: - * Renato Araujo Oliveira Filho + * Nick Dedekind */ #include "unitymenumodel.h" -- cgit v1.2.3