diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 18:25:47 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-11-23 18:25:47 +0000 |
| commit | 68533d0fedf1bf3a0e6f45230e03222510dd6af6 (patch) | |
| tree | 78bad3b47623221cdcaf871305f77c71462faa13 /libqmenumodel/src/qdbusmenumodel.cpp | |
| parent | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (diff) | |
| parent | bdc349d16b6e88c64e6ad16513f33d71bf1a643d (diff) | |
| download | qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.tar.gz qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.tar.bz2 qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.zip | |
Fixed QMenumodel behavior when the GMenuModel is destroyed.
Approved by Lars Uebernickel, PS Jenkins bot.
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 */ |