~mterry/unity8/split

« back to all changes in this revision

Viewing changes to plugins/Unity/Indicators/rootactionstate.cpp

  • Committer: Michael Terry
  • Date: 2014-05-15 15:04:44 UTC
  • mfrom: (138.516.136 unity8)
  • Revision ID: michael.terry@canonical.com-20140515150444-mijpp6zz1c6o04jn
MergeĀ fromĀ trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
240
240
 
241
241
                QStringList icons;
242
242
 
243
 
                if (g_variant_type_is_array(g_variant_get_type(vvalue))) {
244
 
 
245
 
 
246
 
                    for (int i = 0, iMax = g_variant_n_children(vvalue); i < iMax; i++) {
247
 
                        GVariant *child = g_variant_get_child_value(vvalue, i);
248
 
 
 
243
                if (g_variant_is_of_type(vvalue, G_VARIANT_TYPE("av"))) {
 
244
                    GVariantIter iter;
 
245
                    GVariant *val = 0;
 
246
                    g_variant_iter_init (&iter, vvalue);
 
247
                    while (g_variant_iter_loop (&iter, "v", &val))
 
248
                    {
249
249
                        // FIXME - should be sending a url.
250
 
                        GIcon *gicon = g_icon_deserialize (child);
 
250
                        GIcon *gicon = g_icon_deserialize (val);
251
251
                        if (gicon) {
252
252
                            icons << iconUri(gicon);
253
253
                            g_object_unref (gicon);
254
254
                        }
255
 
                        g_variant_unref(child);
256
255
                    }
257
256
                }
258
257
                // will overwrite icon.