gobject-introspection 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc58d3a16683bfc549a15a04932160e7a03962f
-  data.tar.gz: e33422fa5a785789df80009cd998fbc45614083e
+  metadata.gz: 203283bdb8829a6d146912b5cb50aab9ead33fe9
+  data.tar.gz: 12f46768a57b200f3bce153626141a0a89a10e76
 SHA512:
-  metadata.gz: 5f6b837f2f656efd261f96196ed1d83ecaaca0e1c074281d762b71471374db75afedc353f89940e7af929d297f7e306900d6773997db29ac0dafa636b61da7f9
-  data.tar.gz: 94af97fd8d5d02188929b2e0ad560eed9d47add513364772c7e3b46d8efc7dc4539b7b52577f5bf13f935323b61762c2d99a6dcb60624831c2ba1e176f2369b0
+  metadata.gz: 86e63fb30f134a068addd7311fd19978580e850a5953e73c5d483051842bbe72d7541753300e15eb777f4a397a2f75857b364f04b1490804137a3fd324c57c5a
+  data.tar.gz: 4400ba2f3114334b3019b73e4ccecebf28e4679af9707e108297572ba2235941311f2c8f4c4215228c6f50b65124e878a02897edefbf5a4d31793184acefa4e8

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.38.2",
+      :version => "2.42.0",
       :compression_method => "xz",
       :windows => {
         :build => false,
@@ -47,7 +47,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gobject-introspection",
       :download_site => :gnome,
       :label => "gobject-introspection",
-      :version => "1.38.0",
+      :version => "1.42.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -55,7 +55,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
           "--disable-tests",
         ],
         :patches => [
-          "0001-Support-external-g-ir-scanner.patch",
+          "support-external-g-ir-scanner.diff",
         ],
         :need_autoreconf => true,
         :built_file => "bin/libgirepository-1.0-1.dll",
@@ -87,7 +87,7 @@ namespace :native do
   end
 
   namespace :builder do
-    task :after => "native:gobject-introspection:cross"
+    # task :after => "native:gobject-introspection:cross"
   end
 end
 
@@ -104,7 +104,7 @@ namespace :win32 do
       original_pc.each_line do |line|
         case line
         when /\Ag_ir_(scanner|compiler)=/
-          new_pc << line.gsub(/\${bindir}/, "${native_bindir}")
+          new_pc << line.gsub(/\${bindir}/, "${native_bindir}").gsub(/\.exe/, "")
         else
           new_pc << line
         end
@@ -116,6 +116,6 @@ namespace :win32 do
   end
 
   namespace :builder do
-    task :after => "win32:gobject-introspection:cross"
+    # task :after => "win32:gobject-introspection:cross"
   end
 end

data/ext/gobject-introspection/rb-gi-argument.c

@@ -953,7 +953,9 @@ rb_gi_argument_from_ruby_interface(GIArgument *argument, GITypeInfo *type_info,
                  g_base_info_get_name(interface_info));
         break;
       case GI_INFO_TYPE_STRUCT:
-        if (gtype == G_TYPE_VALUE) {
+        if (gtype == G_TYPE_NONE) {
+            argument->v_pointer = DATA_PTR(rb_argument);
+        } else if (gtype == G_TYPE_VALUE) {
             GValue *gvalue;
             gvalue = ALLOC(GValue);
             memset(gvalue, 0, sizeof(GValue));
@@ -1419,6 +1421,22 @@ set_in_array_length_argument(GIArgument *argument,
     }
 }
 
+static void
+set_in_array_gtype_arguments_from_ruby(GIArgument *array_argument,
+                                       VALUE rb_class_array)
+{
+    GType *types;
+    gint i, n_args;
+
+    n_args = RARRAY_LEN(rb_class_array);
+    types = ALLOC_N(GType, n_args);
+    for (i = 0; i < n_args; i++) {
+        types[i] = CLASS2GTYPE(RARRAY_PTR(rb_class_array)[i]);
+    }
+
+    array_argument->v_pointer = types;
+}
+
 static void
 in_array_c_argument_from_ruby(GIArgument *array_argument,
                               GIArgument *length_argument,
@@ -1451,11 +1469,16 @@ in_array_c_argument_from_ruby(GIArgument *array_argument,
       case GI_TYPE_TAG_UINT64:
       case GI_TYPE_TAG_FLOAT:
       case GI_TYPE_TAG_DOUBLE:
-      case GI_TYPE_TAG_GTYPE:
         rb_raise(rb_eNotImpError,
                  "TODO: Ruby -> GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+      case GI_TYPE_TAG_GTYPE:
+        set_in_array_gtype_arguments_from_ruby(array_argument,
+                                               rb_argument);
+        set_in_array_length_argument(length_argument, length_type_info,
+                                     RARRAY_LEN(rb_argument));
+        break;
       case GI_TYPE_TAG_UTF8:
       case GI_TYPE_TAG_FILENAME:
         array_argument->v_pointer = RVAL2STRV(rb_argument);
@@ -1685,11 +1708,13 @@ rb_gi_value_argument_free_array_c(GIArgument *argument,
       case GI_TYPE_TAG_UINT64:
       case GI_TYPE_TAG_FLOAT:
       case GI_TYPE_TAG_DOUBLE:
-      case GI_TYPE_TAG_GTYPE:
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+      case GI_TYPE_TAG_GTYPE:
+        xfree(argument->v_pointer);
+        break;
       case GI_TYPE_TAG_UTF8:
       case GI_TYPE_TAG_FILENAME:
         g_free(argument->v_pointer);

data/ext/gobject-introspection/rb-gi-constructor-info.c

@@ -65,7 +65,12 @@ initialize_receiver(VALUE receiver, GITypeInfo *info, GIArgument *value)
       case GI_INFO_TYPE_INTERFACE:
       case GI_INFO_TYPE_CONSTANT:
       case GI_INFO_TYPE_INVALID_0:
+        rb_raise(rb_eRuntimeError,
+                 "TODO: returned value isn't object, struct or union");
+        break;
       case GI_INFO_TYPE_UNION:
+        G_INITIALIZE(receiver, value->v_pointer);
+        break;
       case GI_INFO_TYPE_VALUE:
       case GI_INFO_TYPE_SIGNAL:
       case GI_INFO_TYPE_VFUNC:
@@ -76,7 +81,7 @@ initialize_receiver(VALUE receiver, GITypeInfo *info, GIArgument *value)
       case GI_INFO_TYPE_UNRESOLVED:
       default:
         rb_raise(rb_eRuntimeError,
-                 "TODO: returned value isn't object or struct");
+                 "TODO: returned value isn't object, struct or union");
         break;
     }
 }

data/ext/gobject-introspection/rb-gi-function-info.c

@@ -93,7 +93,6 @@ allocate_arguments(GICallableInfo *info,
                    GPtrArray *args_metadata)
 {
     gint i, n_args;
-    gint rb_arg_index = 0;
 
     n_args = g_callable_info_get_n_args(info);
     for (i = 0; i < n_args; i++) {
@@ -127,7 +126,6 @@ allocate_arguments(GICallableInfo *info,
         if (direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT) {
             metadata->in_arg_index = in_args->len;
             g_array_append_val(in_args, argument);
-            metadata->rb_arg_index = rb_arg_index++;
         }
         if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT) {
             metadata->out_arg_index = out_args->len;
@@ -161,7 +159,6 @@ fill_metadata_callback(GPtrArray *args_metadata)
             closure_metadata = g_ptr_array_index(args_metadata, closure_index);
             closure_metadata->closure_p = TRUE;
             metadata->closure_in_arg_index = closure_metadata->in_arg_index;
-            closure_metadata->rb_arg_index = -1;
         }
 
         destroy_index = g_arg_info_get_destroy(arg_info);
@@ -170,7 +167,6 @@ fill_metadata_callback(GPtrArray *args_metadata)
             destroy_metadata = g_ptr_array_index(args_metadata, destroy_index);
             destroy_metadata->destroy_p = TRUE;
             metadata->destroy_in_arg_index = destroy_metadata->in_arg_index;
-            destroy_metadata->rb_arg_index = -1;
         }
     }
 }
@@ -213,11 +209,40 @@ fill_metadata_array(GPtrArray *args_metadata)
     }
 }
 
+static void
+fill_metadata_rb_arg_index(GPtrArray *args_metadata)
+{
+    guint i;
+    gint rb_arg_index = 0;
+
+    for (i = 0; i < args_metadata->len; i++) {
+        RBGIArgMetadata *metadata;
+
+        metadata = g_ptr_array_index(args_metadata, i);
+
+        if (metadata->closure_p) {
+            continue;
+        }
+
+        if (metadata->destroy_p) {
+            continue;
+        }
+
+        if (metadata->array_length_p) {
+            continue;
+        }
+
+        metadata->rb_arg_index = rb_arg_index;
+        rb_arg_index++;
+    }
+}
+
 static void
 fill_metadata(GPtrArray *args_metadata)
 {
     fill_metadata_callback(args_metadata);
     fill_metadata_array(args_metadata);
+    fill_metadata_rb_arg_index(args_metadata);
 }
 
 static void

data/ext/gobject-introspection/rb-gi-loader.c

@@ -27,18 +27,24 @@ static const gchar *boxed_class_converters_name = "@@boxed_class_converters";
 static VALUE
 rg_s_define_class(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
 {
+    VALUE rb_class;
     VALUE rb_gtype, rb_name, rb_module;
-    VALUE rb_options, rb_parent;
+    VALUE rb_options, rb_parent, rb_size;
     GType gtype;
 
     rb_scan_args(argc, argv, "31", &rb_gtype, &rb_name, &rb_module, &rb_options);
     rbg_scan_options(rb_options,
                      "parent", &rb_parent,
+                     "size", &rb_size,
                      NULL);
 
     gtype = NUM2ULONG(rb_to_int(rb_gtype));
-    return G_DEF_CLASS_WITH_PARENT(gtype, RVAL2CSTR(rb_name),
-                                   rb_module, rb_parent);
+    rb_class = G_DEF_CLASS_WITH_PARENT(gtype, RVAL2CSTR(rb_name),
+                                       rb_module, rb_parent);
+    if (!NIL_P(rb_size)) {
+        rb_iv_set(rb_class, "@size", rb_size);
+    }
+    return rb_class;
 }
 
 static VALUE
@@ -183,6 +189,15 @@ rg_s_register_boxed_class_converter(VALUE klass, VALUE rb_gtype)
     return Qnil;
 }
 
+static VALUE
+rg_s_register_constant_rename_map(G_GNUC_UNUSED VALUE klass,
+                                  VALUE rb_original,
+                                  VALUE rb_renamed)
+{
+    G_RENAME_CONSTANT(RVAL2CSTR(rb_original), RVAL2CSTR(rb_renamed));
+    return Qnil;
+}
+
 static VALUE
 rg_s_start_callback_dispatch_thread(G_GNUC_UNUSED VALUE klass)
 {
@@ -204,5 +219,6 @@ rb_gi_loader_init(VALUE rb_mGI)
     RG_DEF_SMETHOD(define_struct, -1);
     RG_DEF_SMETHOD(define_error, -1);
     RG_DEF_SMETHOD(register_boxed_class_converter, 1);
+    RG_DEF_SMETHOD(register_constant_rename_map, 2);
     RG_DEF_SMETHOD(start_callback_dispatch_thread, 0);
 }

data/ext/gobject-introspection/rb-gi-struct-info.c

@@ -55,28 +55,42 @@ rg_get_field(VALUE self, VALUE rb_n)
     return GI_BASE_INFO2RVAL_WITH_UNREF(g_struct_info_get_field(info, n));
 }
 
+static gpointer
+extract_raw_struct(VALUE rb_struct,
+                   GIStructInfo *struct_info)
+{
+    GType gtype;
+    gpointer raw_struct;
+
+    gtype = g_registered_type_info_get_g_type(struct_info);
+    if (gtype == G_TYPE_NONE && rb_respond_to(rb_struct, rb_intern("gtype"))) {
+        VALUE rb_gtype;
+        rb_gtype = rb_funcall(rb_struct, rb_intern("gtype"), 0);
+        gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
+    }
+    if (gtype == G_TYPE_NONE) {
+        raw_struct = DATA_PTR(rb_struct);
+    } else {
+        raw_struct = RVAL2BOXED(rb_struct, gtype);
+    }
+
+    return raw_struct;
+}
+
 static VALUE
 rg_get_field_value(VALUE self, VALUE rb_struct, VALUE rb_n)
 {
     GIStructInfo *info;
+    gpointer raw_struct;
     gint n;
     GIFieldInfo *field_info;
     VALUE rb_value;
-    gpointer instance;
 
     info = SELF(self);
+    raw_struct = extract_raw_struct(rb_struct, info);
     n = NUM2INT(rb_n);
     field_info = g_struct_info_get_field(info, n);
-    if (rb_respond_to(rb_struct, rb_intern("gtype"))) {
-        VALUE rb_gtype;
-        GType gtype;
-        rb_gtype = rb_funcall(rb_struct, rb_intern("gtype"), 0);
-        gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
-        instance = RVAL2BOXED(rb_struct, gtype);
-    } else {
-        Data_Get_Struct(rb_struct, void, instance);
-    }
-    rb_value = rb_gi_field_info_get_field_raw(field_info, instance);
+    rb_value = rb_gi_field_info_get_field_raw(field_info, raw_struct);
     g_base_info_unref(field_info);
 
     return rb_value;
@@ -86,17 +100,15 @@ static VALUE
 rg_set_field_value(VALUE self, VALUE rb_struct, VALUE rb_n, VALUE rb_value)
 {
     GIStructInfo *info;
+    gpointer raw_struct;
     gint n;
     GIFieldInfo *field_info;
-    GType gtype;
 
     info = SELF(self);
+    raw_struct = extract_raw_struct(rb_struct, info);
     n = NUM2INT(rb_n);
     field_info = g_struct_info_get_field(info, n);
-    gtype = g_registered_type_info_get_g_type(info);
-    rb_gi_field_info_set_field_raw(field_info,
-                                   RVAL2BOXED(rb_struct, gtype),
-                                   rb_value);
+    rb_gi_field_info_set_field_raw(field_info, raw_struct, rb_value);
     /* TODO: use rb_ensure() to unref field_info. */
     g_base_info_unref(field_info);
 

data/lib/gobject-introspection/callable-info.rb

@@ -23,22 +23,31 @@ module GObjectIntrospection
     collection_reader("args")
 
     def in_args
+      array_length_indexes = []
       callback_indexes = []
       closure_indexes = []
       destroy_indexes = []
       args.each_with_index do |arg, i|
-        next if arg.scope == ScopeType::INVALID
-        callback_indexes << i
-        closure_index = arg.closure
-        closure_indexes << closure_index if closure_index != -1
-        destroy_index = arg.destroy
-        destroy_indexes << destroy_index if destroy_index != -1
+        if arg.type.tag == TypeTag::ARRAY
+          array_length = arg.type.array_length
+          array_length_indexes << array_length if array_length != -1
+        end
+
+        unless arg.scope == ScopeType::INVALID
+          callback_indexes << i
+          closure_index = arg.closure
+          closure_indexes << closure_index if closure_index != -1
+          destroy_index = arg.destroy
+          destroy_indexes << destroy_index if destroy_index != -1
+        end
       end
 
       args.find_all.with_index do |arg, i|
         case arg.direction
         when Direction::IN, Direction::INOUT
-          if callback_indexes.include?(i)
+          if array_length_indexes.include?(i)
+            false
+          elsif callback_indexes.include?(i)
             false
           elsif closure_indexes.include?(i)
             false

data/lib/gobject-introspection/loader.rb

@@ -120,7 +120,8 @@ module GObjectIntrospection
                                          :parent => options[:parent])
       else
         klass = self.class.define_class(info.gtype, info.name, @base_module,
-                                        :parent => options[:parent])
+                                        :parent => options[:parent],
+                                        :size   => info.size)
       end
       load_fields(info, klass)
       load_methods(info, klass)
@@ -134,6 +135,7 @@ module GObjectIntrospection
 
     def define_boxed(info)
       klass = self.class.define_class(info.gtype, info.name, @base_module)
+      _ = klass # TODO: Remove me. It is just for suppressing a warning.
       # TODO
       # load_fields(info, klass)
       # load_methods(info, klass)
@@ -223,7 +225,12 @@ module GObjectIntrospection
       flags = field_info.flags
 
       if flags.readable?
-        klass.__send__(:define_method, name) do ||
+        if field_info.type.tag == TypeTag::BOOLEAN
+          reader_method_name = "#{name}?"
+        else
+          reader_method_name = name
+        end
+        klass.__send__(:define_method, reader_method_name) do ||
           info.get_field_value(self, i)
         end
       end
@@ -291,9 +298,9 @@ module GObjectIntrospection
 
       detail = "#{arguments.size} for "
       if n_in_args == n_required_in_args
-        detail << "#{info.n_in_args}"
+        detail << "#{n_in_args}"
       else
-        detail << "#{info.n_required_in_args}..#{info.n_in_args}"
+        detail << "#{n_required_in_args}..#{n_in_args}"
       end
       message = "#{method_name}: wrong number of arguments (#{detail})"
       raise ArgumentError, message
@@ -304,11 +311,12 @@ module GObjectIntrospection
       max_n_args = nil
       candidate_infos = []
       infos.each do |info|
-        if arguments.size == info.n_in_args
+        n_in_args = info.n_in_args
+        n_required_in_args = info.n_required_in_args
+        if (n_required_in_args..n_in_args).cover?(arguments.size)
           candidate_infos << info
         end
-        n_in_args = info.n_in_args
-        min_n_args = [min_n_args || n_in_args, n_in_args].min
+        min_n_args = [min_n_args || n_required_in_args, n_required_in_args].min
         max_n_args = [max_n_args || n_in_args, n_in_args].max
       end
 
@@ -316,8 +324,9 @@ module GObjectIntrospection
         return candidate_infos.first
       elsif candidate_infos.size > 1
         candidate_info = candidate_infos.find do |info|
-          info.in_args.each.with_index.all? do |arg_info, i|
-            match_argument?(arg_info, arguments[i])
+          in_arg_infos = info.in_args
+          arguments.each.with_index.all? do |argument, i|
+            match_argument?(in_arg_infos[i], argument)
           end
         end
         return candidate_info || candidate_infos.first
@@ -374,29 +383,48 @@ module GObjectIntrospection
       infos.each do |info|
         method_name = rubyish_method_name(info)
         load_method_info(info, klass, method_name)
-        if /\Aset_/ =~ method_name and info.n_args == 1
-          klass.__send__(:alias_method, "#{$POSTMATCH}=", method_name)
-        end
       end
     end
 
     def load_method_info(info, klass, method_name)
+      define_method(info, klass, method_name)
+      define_equal_style_setter(info, klass, method_name)
+    end
+
+    def define_method(info, klass, method_name)
       unlock_gvl = should_unlock_gvl?(info, klass)
       validate = lambda do |arguments|
         validate_arguments(info, "#{klass}\##{method_name}", arguments)
       end
+      if klass.method_defined?(method_name) and
+          klass.instance_method(method_name).owner == klass
+        klass.__send__(:remove_method, method_name)
+      end
+      function_info_p = (info.class == FunctionInfo)
       klass.__send__(:define_method, method_name) do |*arguments, &block|
+        arguments = [self] + arguments if function_info_p
         validate.call(arguments, &block)
         if block.nil? and info.require_callback?
-          Enumerator.new(self, method_name, *arguments)
+          to_enum(method_name, *arguments)
         else
-          info.invoke({
-                        :receiver  => self,
-                        :arguments => arguments,
-                        :unlock_gvl => unlock_gvl,
-                      },
-                      &block)
+          options = {
+            :arguments => arguments,
+            :unlock_gvl => unlock_gvl,
+          }
+          options[:receiver] = self unless function_info_p
+          info.invoke(options, &block)
+        end
+      end
+    end
+
+    def define_equal_style_setter(info, klass, method_name)
+      if /\Aset_/ =~ method_name and info.n_args == 1
+        setter_method_name = "#{$POSTMATCH}="
+        if klass.method_defined?(setter_method_name) and
+            klass.instance_method(setter_method_name).owner == klass
+          klass.__send__(:remove_method, setter_method_name)
         end
+        klass.__send__(:alias_method, setter_method_name, method_name)
       end
     end
 

data/test/test-object-info.rb

@@ -86,7 +86,7 @@ class TestObjectInfo < Test::Unit::TestCase
 
   def test_n_signals
     info = @repository.find("Gio", "Application")
-    assert_equal(5, info.n_signals)
+    assert_operator(5, :<=, info.n_signals)
   end
 
   def test_get_signal

data/test/test-signal-info.rb

@@ -25,8 +25,8 @@ class TestSignalInfo < Test::Unit::TestCase
   end
 
   def test_flags
-    require_version(1, 39, 0)
-    assert_equal(GLib::SignalFlags::RUN_LAST,
+    require_version(1, 40, 0)
+    assert_equal(GLib::SignalFlags::RUN_FIRST,
                  @info.flags)
   end
 

data/test/test-struct-info.rb

@@ -31,7 +31,7 @@ class TestStructInfo < Test::Unit::TestCase
   end
 
   def test_n_methods
-    assert_equal(62, @info.n_methods)
+    assert_operator(@info.n_methods, :>=, 62)
   end
 
   def test_get_method

data/vendor/local/include/gobject-introspection-1.0/giarginfo.h

@@ -31,20 +31,50 @@
 
 G_BEGIN_DECLS
 
+/**
+ * GI_IS_ARG_INFO
+ * @info: an info structure
+ *
+ * Checks if @info is a GIArgInfo.
+ */
 #define GI_IS_ARG_INFO(info) \
     (g_base_info_get_type((GIBaseInfo*)info) ==  GI_INFO_TYPE_ARG)
 
+
+GI_AVAILABLE_IN_ALL
 GIDirection            g_arg_info_get_direction          (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gboolean               g_arg_info_is_return_value        (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gboolean               g_arg_info_is_optional            (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gboolean               g_arg_info_is_caller_allocates    (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gboolean               g_arg_info_may_be_null            (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gboolean               g_arg_info_is_skip                (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 GITransfer             g_arg_info_get_ownership_transfer (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 GIScopeType            g_arg_info_get_scope              (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gint                   g_arg_info_get_closure            (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 gint                   g_arg_info_get_destroy            (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 GITypeInfo *           g_arg_info_get_type               (GIArgInfo *info);
+
+GI_AVAILABLE_IN_ALL
 void                   g_arg_info_load_type              (GIArgInfo *info,
                                                           GITypeInfo *type);
 G_END_DECLS