diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-28 20:07:56 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-28 20:07:56 -0300 |
| commit | 98ed17ed5c2ebab3a396906d4219af2e99988370 (patch) | |
| tree | 526d7f52989723d623e426862393890c60b6cece /libqmenumodel/src/qdbusmenumodel.cpp | |
| parent | 53dfc2a919fd03f5570cb106d71d3989a3f528d9 (diff) | |
| parent | da5a0437d57df35409fedb568b7ebf4e3d6af0da (diff) | |
| download | qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.tar.gz qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.tar.bz2 qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.zip | |
Merged mainline.
Diffstat (limited to 'libqmenumodel/src/qdbusmenumodel.cpp')
| -rw-r--r-- | libqmenumodel/src/qdbusmenumodel.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp index 97990b4..b404d0b 100644 --- a/libqmenumodel/src/qdbusmenumodel.cpp +++ b/libqmenumodel/src/qdbusmenumodel.cpp @@ -95,13 +95,12 @@ void QDBusMenuModel::serviceVanish(GDBusConnection *) /*! \internal */ void QDBusMenuModel::serviceAppear(GDBusConnection *connection) { - GMenuModel *model = reinterpret_cast<GMenuModel*>(g_dbus_menu_model_get(connection, - busName().toUtf8().data(), - objectPath().toUtf8().data())); + GMenuModel *model = G_MENU_MODEL(g_dbus_menu_model_get(connection, + busName().toUtf8().data(), + objectPath().toUtf8().data())); setMenuModel(model); - if (model == NULL) { - stop(); - } + //setModel take care of the ref + g_object_unref(model); } /*! \internal */ |