aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel
diff options
context:
space:
mode:
Diffstat (limited to 'libqmenumodel')
-rw-r--r--libqmenumodel/src/qdbusmenumodel.cpp8
-rw-r--r--libqmenumodel/src/qmenumodel.h1
2 files changed, 2 insertions, 7 deletions
diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index abf259f..b404d0b 100644
--- a/libqmenumodel/src/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
@@ -99,12 +99,8 @@ void QDBusMenuModel::serviceAppear(GDBusConnection *connection)
busName().toUtf8().data(),
objectPath().toUtf8().data()));
setMenuModel(model);
- if (model == NULL) {
- stop();
- } else {
- //setModel take care of the ref
- g_object_unref(model);
- }
+ //setModel take care of the ref
+ g_object_unref(model);
}
/*! \internal */
diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h
index b3ef460..1ab1e7a 100644
--- a/libqmenumodel/src/qmenumodel.h
+++ b/libqmenumodel/src/qmenumodel.h
@@ -63,7 +63,6 @@ private:
QVariant getExtraProperties(const QModelIndex &index) const;
QString parseExtraPropertyName(const QString &name) const;
void clearModel();
- void setMenuModelImpl(GMenuModel *model);
static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data);
};