@@ -243,28 +243,13 @@ void HudClient::modelReady(bool needDisconnect)
243243 }
244244}
245245
246−static QVariant QVariantFromGVariant(GVariant *value)
247−{
248− // Only handle the cases we care for now
249− switch (g_variant_classify(value)) {
250− case G_VARIANT_CLASS_BOOLEAN:
251− return QVariant((bool) g_variant_get_boolean(value));
252− case G_VARIANT_CLASS_DOUBLE:
253− return QVariant(g_variant_get_double(value));
254− case G_VARIANT_CLASS_STRING:
255− return QVariant(QString::fromUtf8(g_variant_get_string(value, NULL)));
256− default:
257− return QVariant();
258− }
259−}
260−
261246static void addAttribute(QVariantMap &properties, GMenuModel *menuModel, int item, const char *attribute) {
262247 GVariant *v = g_menu_model_get_item_attribute_value(menuModel, item, attribute, NULL);
263248
264249 if (v == NULL)
265250 return;
266251
267− properties.insert(attribute, QVariantFromGVariant(v));
252+ properties.insert(attribute, DeeListModel::VariantForData(v));
268253 g_variant_unref(v);
269254}
270255