Merge branch 'correct-1-0'

Attributes GH PR #18: https://github.com/AyatanaIndicators/qmenumodel/pull/18

2 files changed, 2 insertions, 2 deletions

diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index 503827a..f8d6c0b 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -44,6 +44,6 @@ void QMenuModelQmlPlugin::registerTypes(const char *uri)
 
     qmlRegisterType<QDBusMenuModel>(uri, 1, 0, "QDBusMenuModel");
     qmlRegisterType<QDBusActionGroup>(uri, 1, 0, "QDBusActionGroup");
-    qmlRegisterType<AyatanaMenuModel>(uri, 1, 0, "AyatanaMenuAction");
+    qmlRegisterType<AyatanaMenuModel>(uri, 1, 0, "AyatanaMenuModel");
     qmlRegisterType<AyatanaMenuAction>(uri, 1, 0, "AyatanaMenuAction");
 }
diff --git a/libqmenumodel/src/ayatanamenumodel.cpp b/libqmenumodel/src/ayatanamenumodel.cpp
index f535e5c..2c735e6 100644
--- a/libqmenumodel/src/ayatanamenumodel.cpp
+++ b/libqmenumodel/src/ayatanamenumodel.cpp
@@ -682,7 +682,7 @@ bool AyatanaMenuModel::loadExtendedAttributes(int position, const QVariantMap &s
             extendedAttrs->insert(qtify_name (name.toUtf8()), qvalue);
         else
             qCWarning(ayatanamenumodel, "loadExtendedAttributes: key '%s' is of type '%s' (expected '%s')",
-                     name.toUtf8().constData(), g_variant_get_type_string(value), type.constData());
+                     name.toUtf8().constData(), g_variant_get_type_string(value), type.toUtf8().constData());
 
         g_variant_unref (value);
     }