← Back to branch summary

~stolowski/unity-scope-home/handle-model-remove

« back to all changes in this revision

Viewing changes to src/smart-scopes-default-parser.vala

  • Committer: Tarmac
  • Author(s): Pawel Stolowski
  • Date: 2013-09-19 14:32:17 UTC
  • mfrom: (163.1.3 fix-1220630)
  • Revision ID: tarmac-20130919143217-mw5gnxxjbqnju79c
Check if "images" member exists in metadata column to avoid assertion warnings. Fixes: https://bugs.launchpad.net/bugs/1220630.

Approved by PS Jenkins bot, Michal Hruby.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/smart-scopes-default-parser.vala
46
46
      Variant? metadata_var = null;
47
47
      try
48
48
      {
49
 
        var image_obj = metadata.get_object_member ("images");
50
 
        if (image_obj == null)
51
 
          metadata_node.get_object ().remove_member ("images");
 
49
        if (metadata.has_member("images"))
 
50
        {
 
51
            var image_obj = metadata.get_object_member ("images");
 
52
            // protect against "images":null
 
53
            if (image_obj == null)
 
54
                metadata_node.get_object ().remove_member ("images");
 
55
        }
52
56
        // the binding is wrong, deserialize returns floating variant
53
57
        metadata_var = json_gvariant_deserialize (metadata_node, "a{sv}");
54
58
      }