aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Kaijanmäki <antti.kaijanmaki@canonical.com>2014-04-02 13:15:29 +0300
committerAntti Kaijanmäki <antti.kaijanmaki@canonical.com>2014-04-02 13:15:29 +0300
commit112eb60fcc0b3d8075c6dd5d522e1669210a6629 (patch)
treeddbf4b42e1d3a38c63fdcec073db1e1b3c08ad29
parent5809d6f617aafd138de41ef4f7af57cc6d6703e5 (diff)
downloadqmenumodel-112eb60fcc0b3d8075c6dd5d522e1669210a6629.tar.gz
qmenumodel-112eb60fcc0b3d8075c6dd5d522e1669210a6629.tar.bz2
qmenumodel-112eb60fcc0b3d8075c6dd5d522e1669210a6629.zip
revert the last commit.
-rw-r--r--libqmenumodel/src/unitymenumodel.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index 6b57493..a2aae31 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/unitymenumodel.cpp
@@ -294,23 +294,13 @@ void UnityMenuModel::setBusName(const QByteArray &name)
{
priv->clearName();
- if (priv->nameWatchId) {
+ if (priv->nameWatchId)
g_bus_unwatch_name (priv->nameWatchId);
- priv->nameWatchId = 0;
- }
- priv->busName = name;
- if (name.isEmpty())
- return;
-
- /* We could do a g_dbus_is_name() check here if we want to
- * validate the name before passing it to g_bus_watch_name().
- * Currently if an invalid name is passed nameWatchId becomes 0
- * and g_bus_watch_name() prints out a nasty GCritical.
- */
priv->nameWatchId = g_bus_watch_name (G_BUS_TYPE_SESSION, name.constData(), G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
UnityMenuModelPrivate::nameAppeared, UnityMenuModelPrivate::nameVanished,
priv, NULL);
+ priv->busName = name;
}
QVariantMap UnityMenuModel::actions() const