← Back to branch summary

~ubuntu-branches/ubuntu/maverick/glib2.0/maverick-proposed

« back to all changes in this revision

Viewing changes to glib/tests/gvariant.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-09 11:51:31 UTC
  • mfrom: (1.51.1 upstream) (3.4.23 experimental)
  • Revision ID: james.westby@ubuntu.com-20100809115131-pbojavp0jx7vtcah
Tags: 2.25.13-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
  - Add Vcs-Bzr link
  - Recommend libdconf0
  - Don't use "linux-any" for now since soyuz doesn't handle it
  - Suggest python-subunit for dev package
* debian/libglib2.0-0.symbols:
  - Updated the symbols list for the gio launcher handler
* debian/rules:
  - Stop installing the sizable upstream changelog.
* debian/patches/01_gettext-desktopfiles.patch:
  - Updated to use gettext for X-GNOME-Fullname too
* debian/patches/05_file_size_units.patch:
  - Use base 10 units in g_format_size_for_display() (disabled)
* debian/patches/61_glib-compile-schemas-path.patch:
  - Don't use that change since there is a depends which assures to the 
    upstream binary location to be there
* debian/patches/71_gio_launch_handler.patch:
  - New GIO default launch handle feature required for wncksync
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
glib/tests/gvariant.c
612
612
       */
613
613
      ctype = G_VARIANT_TYPE (type_string->str);
614
614
      g_assert (g_variant_type_equal (ctype, type));
 
615
      g_assert (g_variant_type_hash (ctype) == g_variant_type_hash (type));
615
616
      g_assert (g_variant_type_is_subtype_of (ctype, type));
616
617
      g_assert (g_variant_type_is_subtype_of (type, ctype));
617
618
 
2868
2869
    GVariantBuilder array;
2869
2870
 
2870
2871
    g_variant_builder_init (&array, G_VARIANT_TYPE_ARRAY);
2871
 
    g_variant_builder_add (&array, "{sv}", "size",
2872
 
                           g_variant_new ("(ii)", 800, 600));
 
2872
    g_variant_builder_add_parsed (&array, "{'size', <(%i, %i)> }", 800, 600);
2873
2873
    g_variant_builder_add (&array, "{sv}", "title",
2874
2874
                           g_variant_new_string ("Test case"));
2875
2875
    g_variant_builder_add_value (&array,