glib2 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/vendor/local/share/glib-2.0/codegen/codegen.py

@@ -1029,6 +1029,10 @@ class CodeGenerator:
         self.write_gtkdoc_deprecated_and_since_and_close(i, self.c, 0)
         self.c.write('\n')
 
+        self.c.write('typedef %sIface %sInterface;\n'%(i.camel_name, i.camel_name))
+        self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT);\n'%(i.camel_name, i.name_lower))
+        self.c.write('\n')
+
         self.c.write('static void\n'
                      '%s_default_init (%sIface *iface)\n'
                      '{\n'%(i.name_lower, i.camel_name));
@@ -1175,10 +1179,6 @@ class CodeGenerator:
         self.c.write('}\n'
                      '\n')
 
-        self.c.write('typedef %sIface %sInterface;\n'%(i.camel_name, i.camel_name))
-        self.c.write('G_DEFINE_INTERFACE (%s, %s, G_TYPE_OBJECT);\n'%(i.camel_name, i.name_lower))
-        self.c.write('\n')
-
     # ----------------------------------------------------------------------------------------------------
 
     def generate_property_accessors(self, i):
@@ -1570,6 +1570,7 @@ class CodeGenerator:
         self.c.write('static void %s_proxy_iface_init (%sIface *iface);\n'
                      '\n'%(i.name_lower, i.camel_name))
         self.c.write('G_DEFINE_TYPE_WITH_CODE (%sProxy, %s_proxy, G_TYPE_DBUS_PROXY,\n'%(i.camel_name, i.name_lower))
+        self.c.write('                         G_ADD_PRIVATE (%sProxy)\n'%(i.camel_name))
         self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_proxy_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower))
 
         # finalize
@@ -1591,7 +1592,7 @@ class CodeGenerator:
                      '%s_proxy_get_property (GObject      *object,\n'
                      '  guint         prop_id,\n'
                      '  GValue       *value,\n'
-                     '  GParamSpec   *pspec)\n'
+                     '  GParamSpec   *pspec G_GNUC_UNUSED)\n'
                      '{\n'%(i.name_lower))
         if len(i.properties) > 0:
             self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
@@ -1626,7 +1627,7 @@ class CodeGenerator:
                          '  error = NULL;\n'
                          '  if (!g_dbus_proxy_call_finish (proxy, res, &error))\n'
                          '    {\n'
-                         '      g_warning ("Error setting property `%%s\' on interface %s: %%s (%%s, %%d)",\n'
+                         '      g_warning ("Error setting property \'%%s\' on interface %s: %%s (%%s, %%d)",\n'
                          '                 info->parent_struct.name, \n'
                          '                 error->message, g_quark_to_string (error->domain), error->code);\n'
                          '      g_error_free (error);\n'
@@ -1638,7 +1639,7 @@ class CodeGenerator:
                      '%s_proxy_set_property (GObject      *object,\n'
                      '  guint         prop_id,\n'
                      '  const GValue *value,\n'
-                     '  GParamSpec   *pspec)\n'
+                     '  GParamSpec   *pspec G_GNUC_UNUSED)\n'
                      '{\n'%(i.name_lower))
         if len(i.properties) > 0:
             self.c.write('  const _ExtendedGDBusPropertyInfo *info;\n'
@@ -1660,7 +1661,7 @@ class CodeGenerator:
         # signal received
         self.c.write('static void\n'
                      '%s_proxy_g_signal (GDBusProxy *proxy,\n'
-                     '  const gchar *sender_name,\n'
+                     '  const gchar *sender_name G_GNUC_UNUSED,\n'
                      '  const gchar *signal_name,\n'
                      '  GVariant *parameters)\n'
                      '{\n'%(i.name_lower))
@@ -1794,12 +1795,12 @@ class CodeGenerator:
         self.c.write('static void\n'
                      '%s_proxy_init (%sProxy *proxy)\n'
                      '{\n'
-                     '  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, %sTYPE_%s_PROXY, %sProxyPrivate);\n'
+                     '  proxy->priv = %s_proxy_get_instance_private (proxy);\n'
                      '  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), %s_interface_info ());\n'
                      '}\n'
                      '\n'
                      %(i.name_lower, i.camel_name,
-                       i.ns_upper, i.name_upper, i.camel_name,
+                       i.name_lower,
                        i.name_lower))
         self.c.write('static void\n'
                      '%s_proxy_class_init (%sProxyClass *klass)\n'
@@ -1807,8 +1808,6 @@ class CodeGenerator:
                      '  GObjectClass *gobject_class;\n'
                      '  GDBusProxyClass *proxy_class;\n'
                      '\n'
-                     '  g_type_class_add_private (klass, sizeof (%sProxyPrivate));\n'
-                     '\n'
                      '  gobject_class = G_OBJECT_CLASS (klass);\n'
                      '  gobject_class->finalize     = %s_proxy_finalize;\n'
                      '  gobject_class->get_property = %s_proxy_get_property;\n'
@@ -1818,7 +1817,6 @@ class CodeGenerator:
                      '  proxy_class->g_signal = %s_proxy_g_signal;\n'
                      '  proxy_class->g_properties_changed = %s_proxy_g_properties_changed;\n'
                      '\n'%(i.name_lower, i.camel_name,
-                           i.camel_name,
                            i.name_lower, i.name_lower, i.name_lower, i.name_lower, i.name_lower))
         if len(i.properties) > 0:
             self.c.write('\n'
@@ -2070,9 +2068,9 @@ class CodeGenerator:
 
         self.c.write('static void\n'
                      '_%s_skeleton_handle_method_call (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
+                     '  GDBusConnection *connection G_GNUC_UNUSED,\n'
+                     '  const gchar *sender G_GNUC_UNUSED,\n'
+                     '  const gchar *object_path G_GNUC_UNUSED,\n'
                      '  const gchar *interface_name,\n'
                      '  const gchar *method_name,\n'
                      '  GVariant *parameters,\n'
@@ -2142,10 +2140,10 @@ class CodeGenerator:
 
         self.c.write('static GVariant *\n'
                      '_%s_skeleton_handle_get_property (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
-                     '  const gchar *interface_name,\n'
+                     '  GDBusConnection *connection G_GNUC_UNUSED,\n'
+                     '  const gchar *sender G_GNUC_UNUSED,\n'
+                     '  const gchar *object_path G_GNUC_UNUSED,\n'
+                     '  const gchar *interface_name G_GNUC_UNUSED,\n'
                      '  const gchar *property_name,\n'
                      '  GError **error,\n'
                      '  gpointer user_data)\n'
@@ -2178,10 +2176,10 @@ class CodeGenerator:
 
         self.c.write('static gboolean\n'
                      '_%s_skeleton_handle_set_property (\n'
-                     '  GDBusConnection *connection,\n'
-                     '  const gchar *sender,\n'
-                     '  const gchar *object_path,\n'
-                     '  const gchar *interface_name,\n'
+                     '  GDBusConnection *connection G_GNUC_UNUSED,\n'
+                     '  const gchar *sender G_GNUC_UNUSED,\n'
+                     '  const gchar *object_path G_GNUC_UNUSED,\n'
+                     '  const gchar *interface_name G_GNUC_UNUSED,\n'
                      '  const gchar *property_name,\n'
                      '  GVariant *variant,\n'
                      '  GError **error,\n'
@@ -2227,7 +2225,7 @@ class CodeGenerator:
                      '\n'%(i.name_lower, i.name_lower, i.name_lower, i.name_lower))
 
         self.c.write('static GDBusInterfaceInfo *\n'
-                     '%s_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)\n'
+                     '%s_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)\n'
                      '{\n'
                      '  return %s_interface_info ();\n'
                      %(i.name_lower, i.name_lower))
@@ -2235,7 +2233,7 @@ class CodeGenerator:
                      '\n')
 
         self.c.write('static GDBusInterfaceVTable *\n'
-                     '%s_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)\n'
+                     '%s_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)\n'
                      '{\n'
                      '  return (GDBusInterfaceVTable *) &_%s_skeleton_vtable;\n'
                      %(i.name_lower, i.name_lower))
@@ -2341,6 +2339,7 @@ class CodeGenerator:
                      %(i.name_lower, i.camel_name))
 
         self.c.write('G_DEFINE_TYPE_WITH_CODE (%sSkeleton, %s_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,\n'%(i.camel_name, i.name_lower))
+        self.c.write('                         G_ADD_PRIVATE (%sSkeleton)\n'%(i.camel_name))
         self.c.write('                         G_IMPLEMENT_INTERFACE (%sTYPE_%s, %s_skeleton_iface_init));\n\n'%(i.ns_upper, i.name_upper, i.name_lower))
 
         # finalize
@@ -2368,7 +2367,7 @@ class CodeGenerator:
                          '%s_skeleton_get_property (GObject      *object,\n'
                          '  guint         prop_id,\n'
                          '  GValue       *value,\n'
-                         '  GParamSpec   *pspec)\n'
+                         '  GParamSpec   *pspec G_GNUC_UNUSED)\n'
                          '{\n'%(i.name_lower))
             self.c.write('  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
                          '  g_assert (prop_id != 0 && prop_id - 1 < %d);\n'
@@ -2490,7 +2489,7 @@ class CodeGenerator:
             # where the idle will be emitted from
             self.c.write('static void\n'
                          '%s_skeleton_notify (GObject      *object,\n'
-                         '  GParamSpec *pspec)\n'
+                         '  GParamSpec *pspec G_GNUC_UNUSED)\n'
                          '{\n'
                          '  %sSkeleton *skeleton = %s%s_SKELETON (object);\n'
                          '  g_mutex_lock (&skeleton->priv->lock);\n'
@@ -2534,8 +2533,9 @@ class CodeGenerator:
         self.c.write('static void\n'
                      '%s_skeleton_init (%sSkeleton *skeleton)\n'
                      '{\n'
-                     '  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, %sTYPE_%s_SKELETON, %sSkeletonPrivate);\n'
-                     %(i.name_lower, i.camel_name, i.ns_upper, i.name_upper, i.camel_name))
+                     '  skeleton->priv = %s_skeleton_get_instance_private (skeleton);\n'
+                     %(i.name_lower, i.camel_name,
+                       i.name_lower))
         self.c.write('  g_mutex_init (&skeleton->priv->lock);\n')
         self.c.write('  skeleton->priv->context = g_main_context_ref_thread_default ();\n')
         if len(i.properties) > 0:
@@ -2571,11 +2571,9 @@ class CodeGenerator:
                      '  GObjectClass *gobject_class;\n'
                      '  GDBusInterfaceSkeletonClass *skeleton_class;\n'
                      '\n'
-                     '  g_type_class_add_private (klass, sizeof (%sSkeletonPrivate));\n'
-                     '\n'
                      '  gobject_class = G_OBJECT_CLASS (klass);\n'
                      '  gobject_class->finalize = %s_skeleton_finalize;\n'
-                     %(i.name_lower, i.camel_name, i.camel_name, i.name_lower))
+                     %(i.name_lower, i.camel_name, i.name_lower))
         if len(i.properties) > 0:
             self.c.write('  gobject_class->get_property = %s_skeleton_get_property;\n'
                          '  gobject_class->set_property = %s_skeleton_set_property;\n'
@@ -2660,6 +2658,9 @@ class CodeGenerator:
                 %(self.namespace, self.namespace), False))
         self.c.write('\n')
 
+        self.c.write('typedef %sObjectIface %sObjectInterface;\n'%(self.namespace, self.namespace))
+        self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));\n'%(self.namespace, self.ns_lower))
+        self.c.write('\n')
         self.c.write('static void\n'
                      '%sobject_default_init (%sObjectIface *iface)\n'
                      '{\n'
@@ -2680,10 +2681,6 @@ class CodeGenerator:
         self.c.write('}\n'
                      '\n')
 
-        self.c.write('typedef %sObjectIface %sObjectInterface;\n'%(self.namespace, self.namespace))
-        self.c.write('G_DEFINE_INTERFACE_WITH_CODE (%sObject, %sobject, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));\n'%(self.namespace, self.ns_lower))
-        self.c.write('\n')
-
         for i in self.ifaces:
             self.c.write(self.docbook_gen.expand(
                     '/**\n'
@@ -2761,7 +2758,7 @@ class CodeGenerator:
         self.c.write('\n')
         # class boilerplate
         self.c.write('static void\n'
-                     '%sobject_proxy__%sobject_iface_init (%sObjectIface *iface)\n'
+                     '%sobject_proxy__%sobject_iface_init (%sObjectIface *iface G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'
@@ -2782,14 +2779,14 @@ class CodeGenerator:
                      %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
         # class boilerplate
         self.c.write('static void\n'
-                     '%sobject_proxy_init (%sObjectProxy *object)\n'
+                     '%sobject_proxy_init (%sObjectProxy *object G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'%(self.ns_lower, self.namespace))
         self.c.write('static void\n'
                      '%sobject_proxy_set_property (GObject      *gobject,\n'
                      '  guint         prop_id,\n'
-                     '  const GValue *value,\n'
+                     '  const GValue *value G_GNUC_UNUSED,\n'
                      '  GParamSpec   *pspec)\n'
                      '{\n'
                      '  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);\n'
@@ -2881,7 +2878,7 @@ class CodeGenerator:
         self.c.write('\n')
         # class boilerplate
         self.c.write('static void\n'
-                     '%sobject_skeleton__%sobject_iface_init (%sObjectIface *iface)\n'
+                     '%sobject_skeleton__%sobject_iface_init (%sObjectIface *iface G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'
@@ -2902,7 +2899,7 @@ class CodeGenerator:
                      %(self.namespace, self.ns_lower, self.ns_upper, self.ns_lower, self.ns_lower, self.ns_lower))
         # class boilerplate
         self.c.write('static void\n'
-                     '%sobject_skeleton_init (%sObjectSkeleton *object)\n'
+                     '%sobject_skeleton_init (%sObjectSkeleton *object G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'%(self.ns_lower, self.namespace))
@@ -3066,12 +3063,12 @@ class CodeGenerator:
 
         # class boilerplate
         self.c.write('static void\n'
-                     '%sobject_manager_client_init (%sObjectManagerClient *manager)\n'
+                     '%sobject_manager_client_init (%sObjectManagerClient *manager G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'%(self.ns_lower, self.namespace))
         self.c.write('static void\n'
-                     '%sobject_manager_client_class_init (%sObjectManagerClientClass *klass)\n'
+                     '%sobject_manager_client_class_init (%sObjectManagerClientClass *klass G_GNUC_UNUSED)\n'
                      '{\n'
                      '}\n'
                      '\n'%(self.ns_lower, self.namespace))
@@ -3090,7 +3087,7 @@ class CodeGenerator:
                 %(self.ns_lower, self.namespace), False))
         self.c.write(' */\n')
         self.c.write('GType\n'
-                     '%sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data)\n'
+                     '%sobject_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)\n'
                      '{\n'
                      %(self.ns_lower))
         self.c.write('  static gsize once_init_value = 0;\n'

data/vendor/local/share/glib-2.0/codegen/codegen_main.py

@@ -166,7 +166,7 @@ def codegen_main():
 
     all_ifaces = []
     for fname in args:
-        f = open(fname)
+        f = open(fname, 'rb')
         xml_data = f.read()
         f.close()
         parsed_ifaces = parser.parse_dbus_xml(xml_data)

data/vendor/local/share/glib-2.0/codegen/config.py

@@ -24,4 +24,4 @@
 DATADIR = "${prefix}/share"
 DATADIR = DATADIR.replace(
     "${prefix}", "/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local")
-VERSION = "2.36.2"
+VERSION = "2.38.2"

data/vendor/local/share/gtk-doc/html/gio/ExampleAnimal.html

@@ -8,7 +8,7 @@
 <link rel="up" href="ch32s05.html" title="Generating code and docs">
 <link rel="prev" href="gdbus-org.gtk.GDBus.Example.ObjectManager.Cat.html" title="org.gtk.GDBus.Example.ObjectManager.Cat">
 <link rel="next" href="ExampleCat.html" title="ExampleCat">
-<meta name="generator" content="GTK-Doc V1.18.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1296,6 +1296,6 @@ On the service-side, this signal can be used with e.g. <a href="../gobject/gobje
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18.1</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/ExampleCat.html

@@ -8,7 +8,7 @@
 <link rel="up" href="ch32s05.html" title="Generating code and docs">
 <link rel="prev" href="ExampleAnimal.html" title="ExampleAnimal">
 <link rel="next" href="ExampleObject.html" title="ExampleObject">
-<meta name="generator" content="GTK-Doc V1.18.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -589,6 +589,6 @@ Creates a skeleton object for the D-Bus interface <a class="link" href="gdbus-or
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18.1</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/ExampleObject.html

@@ -8,7 +8,7 @@
 <link rel="up" href="ch32s05.html" title="Generating code and docs">
 <link rel="prev" href="ExampleCat.html" title="ExampleCat">
 <link rel="next" href="ExampleObjectManagerClient.html" title="ExampleObjectManagerClient">
-<meta name="generator" content="GTK-Doc V1.18.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -456,6 +456,6 @@ Connect to the <a href="../gobject/gobject-The-Base-Object-Type.html#GObject-not
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18.1</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/ExampleObjectManagerClient.html

@@ -8,7 +8,7 @@
 <link rel="up" href="ch32s05.html" title="Generating code and docs">
 <link rel="prev" href="ExampleObject.html" title="ExampleObject">
 <link rel="next" href="gio-hierarchy.html" title="Object Hierarchy">
-<meta name="generator" content="GTK-Doc V1.18.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -481,6 +481,6 @@ See <a class="link" href="ExampleObjectManagerClient.html#example-object-manager
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18.1</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>