[glib/gvariant] g_variant_type_is_subtype_of -> g_variant_type_is_

[Ryan Lortie <ryanl src gnome org>]

commit be07a1e72b5eedce72b9112548392d68eb3c6d15
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jan 21 14:29:14 2010 -0500

    g_variant_type_is_subtype_of -> g_variant_type_is_
    
    replace g_variant_type_is_subtype_of() use with g_variant_type_is_array()
    and friends where appropriate.

 glib/gvariant-core.c   |    2 +-
 glib/gvariant-markup.c |    2 +-
 glib/gvariant-util.c   |   12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index 4e2972c..4738d0d 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -672,7 +672,7 @@ g_variant_load_fixed (const GVariantType *type,
   GVariant *new;
 
   info = g_variant_type_info_get (type);
-  if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_ARRAY))
+  if (g_variant_type_is_array (type))
     {
       g_variant_type_info_query_element (info, NULL, &fixed_size);
       fixed_size *= n_items;
diff --git a/glib/gvariant-markup.c b/glib/gvariant-markup.c
index 84c9afb..037804a 100644
--- a/glib/gvariant-markup.c
+++ b/glib/gvariant-markup.c
@@ -593,7 +593,7 @@ g_variant_markup_parser_end_element (GMarkupParseContext  *context,
 
   type = type_from_keyword (element_name);
 
-  if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_BASIC))
+  if (g_variant_type_is_basic (type))
     {
       GVariant *value;
       char *string;
diff --git a/glib/gvariant-util.c b/glib/gvariant-util.c
index 60959ec..c5cc35e 100644
--- a/glib/gvariant-util.c
+++ b/glib/gvariant-util.c
@@ -1042,12 +1042,11 @@ g_variant_builder_open (GVariantBuilder    *parent,
 
   if (parent->expected2)
     {
-      if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_MAYBE) ||
-          g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_ARRAY))
+      if (g_variant_type_is_maybe (type) || g_variant_type_is_array (type))
         child->expected2 = g_variant_type_element (parent->expected2);
       
-      if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_TUPLE) ||
-          g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_DICT_ENTRY))
+      if (g_variant_type_is_tuple (type) ||
+          g_variant_type_is_dict_entry (type))
         child->expected2 = g_variant_type_first (parent->expected2);
 
       /* in variant case, we don't want to propagate the type */
@@ -1562,8 +1561,7 @@ gboolean
 g_variant_is_basic (GVariant *value)
 {
   g_return_val_if_fail (value != NULL, FALSE);
-  return g_variant_type_is_subtype_of (g_variant_get_type (value),
-                                       G_VARIANT_TYPE_ANY_BASIC);
+  return g_variant_type_is_basic (g_variant_get_type (value));
 }
 
 /**
@@ -1581,7 +1579,7 @@ gboolean
 g_variant_is_container (GVariant *value)
 {
   g_return_val_if_fail (value != NULL, FALSE);
-  return !g_variant_is_basic (value);
+  return g_variant_type_is_container (g_variant_get_type (value));
 }
 
 #include <stdio.h>