6161205 · unity8 · git.iko.soy

git.iko.soy/unity8

Convert and populate hints column (requires fix to dee-qt).

commit616120557d9bfbb990e22cd999dd2bfcb39a2a25 authorPawel Stolowski <pawel.stolowski@canonical.com> dateFri 21 Jun 2013, 19:15 (13 years ago) parentb806e0e

2 files changed+12−4

compare with xenial

unifiedsplit

plugins/Unity/scope.cpp+1−1 plugins/Unity/variantutils.cpp+11−3

plugins/Unity/scope.cpp+1−1

@@ -177,7 +177,7 @@ void Scope::fallbackActivate(const QString& uri)

177177 qWarning() << "FIXME: Possibly no handler for scheme: " << url.scheme();

178178 qWarning() << "Trying to open" << tweakedUri;

179179 /* Try our luck */

180− QDesktopServices::openUrl(url);

180+ QDesktopServices::openUrl(uri); //url?

181181}

182182

183183void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)

plugins/Unity/variantutils.cpp+11−3

@@ -53,15 +53,15 @@ GVariant* GVariantFromQVariant(const QVariant &var)

5353 QHash<QString, QVariant>::const_iterator it = hash.constBegin();

5454 while (it != hash.constEnd()) {

5555 GVariant *key = g_variant_new_string(it.key().toUtf8());

56− children[++cnt] = g_variant_new_dict_entry(key, GVariantFromQVariant(it.value()));

56+ children[cnt++] = g_variant_new_dict_entry(key, g_variant_new_variant(GVariantFromQVariant(it.value())));

5757 ++it;

5858 }

59− gv = g_variant_new_array(G_VARIANT_TYPE_DICT_ENTRY, children, 1);

59+ gv = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, hash.size());

6060 delete [] children;

6161 break;

6262 }

6363 default:

64− return NULL;

64+ break;

6565 }

6666 return gv;

6767}

@@ -69,6 +69,14 @@ GVariant* GVariantFromQVariant(const QVariant &var)

6969unity::glib::HintsMap hintsMapFromQVariant(const QVariant &var)

7070{

7171 if (var.type() == QVariant::Hash) {

72+ unity::glib::HintsMap hintsMap;

73+ const auto hash = var.toHash();

74+ QHash<QString, QVariant>::const_iterator it = hash.constBegin();

75+ while (it != hash.constEnd()) {

76+ hintsMap[it.key().toStdString()] = GVariantFromQVariant(it.value());

77+ ++it;

78+ }

79+ return hintsMap;

7280 }

7381 return unity::glib::HintsMap();

7482}