Control: tags -1 - moreinfo Am 20.06.2015 um 20:53 schrieb Adam D. Barratt: > Control: tags -1 + moreinfo > > On Wed, 2015-06-03 at 18:08 +0200, Dr. Tobias Quathamer wrote: >> I'd like to update the library libisocodes in jessie. >> >> Paul Wise reported a bug which affects the build of www.debian.org. >> Currently, there is a workaround in place, however, Paul suggested that >> this bug should be fixed in stable as well (#787395). > [...] >> Would you consider such changes for a stable point release? > > In principle, I'd be prepared to do so. > > Before finally confirming that however, we'd need a debdiff of the > proposed package (not just the upstream changes) and confirmation that > the resulting package has been tested on jessie. Hi Adam, thanks for your reply. I've attached the output of debdiff for the version currently in jessie and the proposed update. I've just tried to install the newly built library in an up-to-date jessie installation. It works fine for me and the bug is resolved. @Paul: Do you have the time to also try the new version and confirm that the bug is resolved for you, too? Regards, Tobias
diff -Nru libisocodes-1.2.1/ChangeLog libisocodes-1.2.2/ChangeLog
--- libisocodes-1.2.1/ChangeLog 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/ChangeLog 2015-06-02 23:30:40.000000000 +0200
@@ -1,3 +1,12 @@
+libisocodes 1.2.2
+=================
+2015-06-02
+
+* Fix GLib critical warning if the environment variable LANGUAGE
+ is not set. Thanks to Paul Wise for the bug report.
+ Closes: #787395
+
+
libisocodes 1.2.1
=================
2014-07-08
diff -Nru libisocodes-1.2.1/configure libisocodes-1.2.2/configure
--- libisocodes-1.2.1/configure 2014-07-08 20:20:53.000000000 +0200
+++ libisocodes-1.2.2/configure 2015-06-02 17:43:31.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libisocodes 1.2.1.
+# Generated by GNU Autoconf 2.69 for libisocodes 1.2.2.
#
# Report bugs to <toddy@debian.org>.
#
@@ -650,8 +650,8 @@
# Identity of this package.
PACKAGE_NAME='libisocodes'
PACKAGE_TARNAME='libisocodes'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='libisocodes 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='libisocodes 1.2.2'
PACKAGE_BUGREPORT='toddy@debian.org'
PACKAGE_URL=''
@@ -1419,7 +1419,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libisocodes 1.2.1 to adapt to many kinds of systems.
+\`configure' configures libisocodes 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1489,7 +1489,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libisocodes 1.2.1:";;
+ short | recursive ) echo "Configuration of libisocodes 1.2.2:";;
esac
cat <<\_ACEOF
@@ -1620,7 +1620,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libisocodes configure 1.2.1
+libisocodes configure 1.2.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1898,7 +1898,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libisocodes $as_me 1.2.1, which was
+It was created by libisocodes $as_me 1.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2767,7 +2767,7 @@
# Define the identity of the package.
PACKAGE='libisocodes'
- VERSION='1.2.1'
+ VERSION='1.2.2'
cat >>confdefs.h <<_ACEOF
@@ -2860,6 +2860,7 @@
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -11515,7 +11516,7 @@
# Only expand once:
-LIBISOCODES_LT_VERSION="2:0:1"
+LIBISOCODES_LT_VERSION="2:1:1"
# Check for compilers and pkg-config
@@ -15379,7 +15380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libisocodes $as_me 1.2.1, which was
+This file was extended by libisocodes $as_me 1.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15445,7 +15446,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libisocodes config.status 1.2.1
+libisocodes config.status 1.2.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru libisocodes-1.2.1/configure.ac libisocodes-1.2.2/configure.ac
--- libisocodes-1.2.1/configure.ac 2014-07-08 20:13:05.000000000 +0200
+++ libisocodes-1.2.2/configure.ac 2015-06-02 17:40:47.000000000 +0200
@@ -19,7 +19,7 @@
# Set up autoconf
AC_PREREQ(2.68)
-AC_INIT([libisocodes], [1.2.1], [toddy@debian.org])
+AC_INIT([libisocodes], [1.2.2], [toddy@debian.org])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -31,7 +31,7 @@
# Set up libtool
LT_PREREQ([2.4.2])
LT_INIT
-LIBISOCODES_LT_VERSION="2:0:1"
+LIBISOCODES_LT_VERSION="2:1:1"
AC_SUBST([LIBISOCODES_LT_VERSION])
# Check for compilers and pkg-config
diff -Nru libisocodes-1.2.1/debian/changelog libisocodes-1.2.2/debian/changelog
--- libisocodes-1.2.1/debian/changelog 2014-07-08 20:35:12.000000000 +0200
+++ libisocodes-1.2.2/debian/changelog 2015-06-21 15:55:45.000000000 +0200
@@ -1,3 +1,23 @@
+libisocodes (1.2.2-1~deb8u1) jessie; urgency=medium
+
+ * Imported Upstream version 1.2.2
+ - Fix GLib critical warning if the environment variable LANGUAGE
+ is not set. Thanks to Paul Wise for the bug report.
+ Closes: #787395
+ * Update maintainer name
+
+ -- Dr. Tobias Quathamer <toddy@debian.org> Sun, 21 Jun 2015 15:55:42 +0200
+
+libisocodes (1.2.2-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.2.2
+ - Fix GLib critical warning if the environment variable LANGUAGE
+ is not set. Thanks to Paul Wise for the bug report.
+ Closes: #787395
+ * Update maintainer name
+
+ -- Dr. Tobias Quathamer <toddy@debian.org> Tue, 02 Jun 2015 23:39:59 +0200
+
libisocodes (1.2.1-1) unstable; urgency=medium
* Imported Upstream version 1.2.1
diff -Nru libisocodes-1.2.1/debian/control libisocodes-1.2.2/debian/control
--- libisocodes-1.2.1/debian/control 2014-07-08 20:33:12.000000000 +0200
+++ libisocodes-1.2.2/debian/control 2015-06-02 23:38:23.000000000 +0200
@@ -1,6 +1,6 @@
Source: libisocodes
Priority: optional
-Maintainer: Tobias Quathamer <toddy@debian.org>
+Maintainer: Dr. Tobias Quathamer <toddy@debian.org>
Build-Depends: debhelper (>= 9), dh-autoreconf, valac, libglib2.0-dev,
libxml2-dev, libgee-0.8-dev, libgirepository1.0-dev, gobject-introspection,
# The following packages are only needed for testing during the build
diff -Nru libisocodes-1.2.1/debian/copyright libisocodes-1.2.2/debian/copyright
--- libisocodes-1.2.1/debian/copyright 2014-07-08 20:33:12.000000000 +0200
+++ libisocodes-1.2.2/debian/copyright 2015-06-02 23:39:05.000000000 +0200
@@ -3,13 +3,13 @@
Source: http://pkg-isocodes.alioth.debian.org/downloads/
Files: *
-Copyright: 2012-2013 Tobias Quathamer <toddy@debian.org>
+Copyright: 2012-2014 Dr. Tobias Quathamer <toddy@debian.org>
License: GPL-3.0+
Files: tests/data/*
Copyright: 2002-2006 Alastair McKinstry <mckinstry@computer.org>
2004-2012 Christian Perrier <bubulle@debian.org>
- 2005-2013 Tobias Quathamer <toddy@debian.org>
+ 2005-2013 Dr. Tobias Quathamer <toddy@debian.org>
2007-2009 LI Daobing <lidaobing@gmail.com>
2004 Andreas Jochens <aj@andaco.de>
2007 Ivan Masar <helix84@centrum.sk>
@@ -17,7 +17,7 @@
License: LGPL-2.1+
Files: debian/*
-Copyright: 2013-2014 Tobias Quathamer <toddy@debian.org>
+Copyright: 2013-2015 Dr. Tobias Quathamer <toddy@debian.org>
License: GPL-3.0+
License: GPL-3.0+
diff -Nru libisocodes-1.2.1/libisocodes-1.2.1.gir libisocodes-1.2.2/libisocodes-1.2.1.gir
--- libisocodes-1.2.1/libisocodes-1.2.1.gir 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/libisocodes-1.2.1.gir 1970-01-01 01:00:00.000000000 +0100
@@ -1,625 +0,0 @@
-<?xml version="1.0"?>
-<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0"; xmlns:c="http://www.gtk.org/introspection/c/1.0"; xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-<include name="GObject" version="2.0"/>
-<package name="libisocodes"/>
-<c:include name="libisocodes.h"/>
-<namespace name="libisocodes" version="1.2.1" c:prefix="libisocodes">
- <errordomain name="ISOCodesError" get-quark="libisocodes_iso_codes_error_quark" codes="ISOCodesError">
-</errordomain>
- <enumeration name="ISOCodesError" c:type="libisocodesISOCodesError">
- <member name="cannot_open_file" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_OPEN_FILE" value="0"/>
- <member name="cannot_create_libxml_structure" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_CREATE_LIBXML_STRUCTURE" value="1"/>
- <member name="cannot_parse_file" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_PARSE_FILE" value="2"/>
- <member name="file_does_not_contain_iso_data" c:identifier="LIBISOCODES_ISO_CODES_ERROR_FILE_DOES_NOT_CONTAIN_ISO_DATA" value="3"/>
- <member name="code_not_defined" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CODE_NOT_DEFINED" value="4"/>
- </enumeration>
- <class name="ISO_Codes" c:type="libisocodesISO_Codes" glib:type-name="libisocodesISO_Codes" glib:get-type="libisocodes_iso_codes_get_type" glib:type-struct="ISO_CodesClass" parent="GObject.Object" abstract="1">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_CodesPrivate" c:type="libisocodesISO_CodesPrivate*"/>
- </field>
- <method name="get_iso_codes_xml_version" c:identifier="libisocodes_iso_codes_get_iso_codes_xml_version" throws="1">
- <return-value transfer-ownership="full">
- <type name="utf8" c:type="gchar*"/>
- </return-value>
- </method>
- <method name="get_filepath" c:identifier="libisocodes_iso_codes_get_filepath">
- <return-value transfer-ownership="full">
- <type name="utf8" c:type="gchar*"/>
- </return-value>
- </method>
- <method name="set_filepath" c:identifier="libisocodes_iso_codes_set_filepath">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- <parameters>
- <parameter name="path" transfer-ownership="none" allow-none="1">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_locale" c:identifier="libisocodes_iso_codes_get_locale">
- <return-value transfer-ownership="full">
- <type name="utf8" c:type="gchar*"/>
- </return-value>
- </method>
- <method name="set_locale" c:identifier="libisocodes_iso_codes_set_locale">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- <parameters>
- <parameter name="locale" transfer-ownership="none" allow-none="1">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_CodesClass" c:type="libisocodesISO_CodesClass" glib:is-gtype-struct-for="ISO_Codes">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- <field name="_get_xpaths">
- <callback name="_get_xpaths" c:type="_get_xpaths">
- <return-value transfer-ownership="full">
- <array length="2">
- <type name="utf8" c:type="gchar*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="self" transfer-ownership="none">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes*"/>
- </parameter>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </callback>
- </field>
- <field name="_get_fields">
- <callback name="_get_fields" c:type="_get_fields">
- <return-value transfer-ownership="full">
- <array length="1">
- <type name="utf8" c:type="gchar*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="self" transfer-ownership="none">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes*"/>
- </parameter>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </callback>
- </field>
- </record>
- <record name="ISO_CodesPrivate" c:type="libisocodesISO_CodesPrivate" disguised="1"/>
- <class name="ISO_3166" c:type="libisocodesISO_3166" glib:type-name="libisocodesISO_3166" glib:get-type="libisocodes_iso_3166_get_type" glib:type-struct="ISO_3166Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_3166Private" c:type="libisocodesISO_3166Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_3166_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_3166" c:type="libisocodesISO_3166*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_3166_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_3166_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_3166_Item" c:type="libisocodesISO_3166_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_3166_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_3166_Item" c:type="libisocodesISO_3166_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_3166Class" c:type="libisocodesISO_3166Class" glib:is-gtype-struct-for="ISO_3166">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_3166Private" c:type="libisocodesISO_3166Private" disguised="1"/>
- <class name="ISO_3166_Item" c:type="libisocodesISO_3166_Item" glib:type-name="libisocodesISO_3166_Item" glib:get-type="libisocodes_iso_3166_item_get_type" glib:type-struct="ISO_3166_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_3166_ItemPrivate" c:type="libisocodesISO_3166_ItemPrivate*"/>
- </field>
- <field name="alpha_2_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="alpha_3_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="numeric_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="official_name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="common_name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_3166_ItemClass" c:type="libisocodesISO_3166_ItemClass" glib:is-gtype-struct-for="ISO_3166_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_3166_ItemPrivate" c:type="libisocodesISO_3166_ItemPrivate" disguised="1"/>
- <class name="ISO_3166_2" c:type="libisocodesISO_3166_2" glib:type-name="libisocodesISO_3166_2" glib:get-type="libisocodes_iso_3166_2_get_type" glib:type-struct="ISO_3166_2Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_3166_2Private" c:type="libisocodesISO_3166_2Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_3166_2_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_3166_2" c:type="libisocodesISO_3166_2*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_3166_2_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_3166_2_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_3166_2_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_3166_2Class" c:type="libisocodesISO_3166_2Class" glib:is-gtype-struct-for="ISO_3166_2">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_3166_2Private" c:type="libisocodesISO_3166_2Private" disguised="1"/>
- <class name="ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item" glib:type-name="libisocodesISO_3166_2_Item" glib:get-type="libisocodes_iso_3166_2_item_get_type" glib:type-struct="ISO_3166_2_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_3166_2_ItemPrivate" c:type="libisocodesISO_3166_2_ItemPrivate*"/>
- </field>
- <field name="country">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="type">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="parent">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_3166_2_ItemClass" c:type="libisocodesISO_3166_2_ItemClass" glib:is-gtype-struct-for="ISO_3166_2_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_3166_2_ItemPrivate" c:type="libisocodesISO_3166_2_ItemPrivate" disguised="1"/>
- <class name="ISO_639" c:type="libisocodesISO_639" glib:type-name="libisocodesISO_639" glib:get-type="libisocodes_iso_639_get_type" glib:type-struct="ISO_639Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_639Private" c:type="libisocodesISO_639Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_639_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639" c:type="libisocodesISO_639*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_639_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_639_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_639_Item" c:type="libisocodesISO_639_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_639_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639_Item" c:type="libisocodesISO_639_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_639Class" c:type="libisocodesISO_639Class" glib:is-gtype-struct-for="ISO_639">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_639Private" c:type="libisocodesISO_639Private" disguised="1"/>
- <class name="ISO_639_Item" c:type="libisocodesISO_639_Item" glib:type-name="libisocodesISO_639_Item" glib:get-type="libisocodes_iso_639_item_get_type" glib:type-struct="ISO_639_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_639_ItemPrivate" c:type="libisocodesISO_639_ItemPrivate*"/>
- </field>
- <field name="iso_639_2B_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="iso_639_2T_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="iso_639_1_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_639_ItemClass" c:type="libisocodesISO_639_ItemClass" glib:is-gtype-struct-for="ISO_639_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_639_ItemPrivate" c:type="libisocodesISO_639_ItemPrivate" disguised="1"/>
- <class name="ISO_639_3" c:type="libisocodesISO_639_3" glib:type-name="libisocodesISO_639_3" glib:get-type="libisocodes_iso_639_3_get_type" glib:type-struct="ISO_639_3Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_639_3Private" c:type="libisocodesISO_639_3Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_639_3_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639_3" c:type="libisocodesISO_639_3*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_639_3_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_639_3_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_639_3_Item" c:type="libisocodesISO_639_3_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_639_3_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639_3_Item" c:type="libisocodesISO_639_3_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_639_3Class" c:type="libisocodesISO_639_3Class" glib:is-gtype-struct-for="ISO_639_3">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_639_3Private" c:type="libisocodesISO_639_3Private" disguised="1"/>
- <class name="ISO_639_3_Item" c:type="libisocodesISO_639_3_Item" glib:type-name="libisocodesISO_639_3_Item" glib:get-type="libisocodes_iso_639_3_item_get_type" glib:type-struct="ISO_639_3_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_639_3_ItemPrivate" c:type="libisocodesISO_639_3_ItemPrivate*"/>
- </field>
- <field name="id">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="part1_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="part2_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="status">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="scope">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="type">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="inverted_name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="reference_name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="common_name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_639_3_ItemClass" c:type="libisocodesISO_639_3_ItemClass" glib:is-gtype-struct-for="ISO_639_3_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_639_3_ItemPrivate" c:type="libisocodesISO_639_3_ItemPrivate" disguised="1"/>
- <class name="ISO_639_5" c:type="libisocodesISO_639_5" glib:type-name="libisocodesISO_639_5" glib:get-type="libisocodes_iso_639_5_get_type" glib:type-struct="ISO_639_5Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_639_5Private" c:type="libisocodesISO_639_5Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_639_5_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639_5" c:type="libisocodesISO_639_5*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_639_5_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_639_5_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_639_5_Item" c:type="libisocodesISO_639_5_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_639_5_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_639_5_Item" c:type="libisocodesISO_639_5_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_639_5Class" c:type="libisocodesISO_639_5Class" glib:is-gtype-struct-for="ISO_639_5">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_639_5Private" c:type="libisocodesISO_639_5Private" disguised="1"/>
- <class name="ISO_639_5_Item" c:type="libisocodesISO_639_5_Item" glib:type-name="libisocodesISO_639_5_Item" glib:get-type="libisocodes_iso_639_5_item_get_type" glib:type-struct="ISO_639_5_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_639_5_ItemPrivate" c:type="libisocodesISO_639_5_ItemPrivate*"/>
- </field>
- <field name="id">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="parents">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_639_5_ItemClass" c:type="libisocodesISO_639_5_ItemClass" glib:is-gtype-struct-for="ISO_639_5_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_639_5_ItemPrivate" c:type="libisocodesISO_639_5_ItemPrivate" disguised="1"/>
- <class name="ISO_4217" c:type="libisocodesISO_4217" glib:type-name="libisocodesISO_4217" glib:get-type="libisocodes_iso_4217_get_type" glib:type-struct="ISO_4217Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_4217Private" c:type="libisocodesISO_4217Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_4217_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_4217" c:type="libisocodesISO_4217*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_4217_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_4217_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_4217_Item" c:type="libisocodesISO_4217_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_4217_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_4217_Item" c:type="libisocodesISO_4217_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_4217Class" c:type="libisocodesISO_4217Class" glib:is-gtype-struct-for="ISO_4217">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_4217Private" c:type="libisocodesISO_4217Private" disguised="1"/>
- <class name="ISO_4217_Item" c:type="libisocodesISO_4217_Item" glib:type-name="libisocodesISO_4217_Item" glib:get-type="libisocodes_iso_4217_item_get_type" glib:type-struct="ISO_4217_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_4217_ItemPrivate" c:type="libisocodesISO_4217_ItemPrivate*"/>
- </field>
- <field name="letter_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="numeric_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_4217_ItemClass" c:type="libisocodesISO_4217_ItemClass" glib:is-gtype-struct-for="ISO_4217_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_4217_ItemPrivate" c:type="libisocodesISO_4217_ItemPrivate" disguised="1"/>
- <class name="ISO_15924" c:type="libisocodesISO_15924" glib:type-name="libisocodesISO_15924" glib:get-type="libisocodes_iso_15924_get_type" glib:type-struct="ISO_15924Class" parent="libisocodes.ISO_Codes">
- <field name="parent_instance">
- <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
- </field>
- <field name="priv">
- <type name="ISO_15924Private" c:type="libisocodesISO_15924Private*"/>
- </field>
- <constructor name="new" c:identifier="libisocodes_iso_15924_new">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_15924" c:type="libisocodesISO_15924*"/>
- </return-value>
- </constructor>
- <method name="setup" c:identifier="libisocodes_iso_15924_setup">
- <return-value transfer-ownership="full">
- <type name="none"/>
- </return-value>
- </method>
- <method name="find_all" c:identifier="libisocodes_iso_15924_find_all" throws="1">
- <return-value transfer-ownership="full">
- <array length="0">
- <type name="libisocodes.ISO_15924_Item" c:type="libisocodesISO_15924_Item*"/>
- </array>
- </return-value>
- <parameters>
- <parameter name="result_length1" direction="out" transfer-ownership="none">
- <type name="gint" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_code" c:identifier="libisocodes_iso_15924_find_code" throws="1">
- <return-value transfer-ownership="full">
- <type name="libisocodes.ISO_15924_Item" c:type="libisocodesISO_15924_Item*"/>
- </return-value>
- <parameters>
- <parameter name="code" transfer-ownership="none">
- <type name="utf8" c:type="const gchar*"/>
- </parameter>
- </parameters>
- </method>
- </class>
- <record name="ISO_15924Class" c:type="libisocodesISO_15924Class" glib:is-gtype-struct-for="ISO_15924">
- <field name="parent_class">
- <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
- </field>
- </record>
- <record name="ISO_15924Private" c:type="libisocodesISO_15924Private" disguised="1"/>
- <class name="ISO_15924_Item" c:type="libisocodesISO_15924_Item" glib:type-name="libisocodesISO_15924_Item" glib:get-type="libisocodes_iso_15924_item_get_type" glib:type-struct="ISO_15924_ItemClass" parent="GObject.Object">
- <field name="parent_instance">
- <type name="GObject.Object" c:type="GObject"/>
- </field>
- <field name="priv">
- <type name="ISO_15924_ItemPrivate" c:type="libisocodesISO_15924_ItemPrivate*"/>
- </field>
- <field name="alpha_4_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="numeric_code">
- <type name="utf8" c:type="gchar*"/>
- </field>
- <field name="name">
- <type name="utf8" c:type="gchar*"/>
- </field>
- </class>
- <record name="ISO_15924_ItemClass" c:type="libisocodesISO_15924_ItemClass" glib:is-gtype-struct-for="ISO_15924_Item">
- <field name="parent_class">
- <type name="GObject.ObjectClass" c:type="GObjectClass"/>
- </field>
- </record>
- <record name="ISO_15924_ItemPrivate" c:type="libisocodesISO_15924_ItemPrivate" disguised="1"/>
-</namespace>
-</repository>
diff -Nru libisocodes-1.2.1/libisocodes-1.2.2.gir libisocodes-1.2.2/libisocodes-1.2.2.gir
--- libisocodes-1.2.1/libisocodes-1.2.2.gir 1970-01-01 01:00:00.000000000 +0100
+++ libisocodes-1.2.2/libisocodes-1.2.2.gir 2015-06-02 23:32:34.000000000 +0200
@@ -0,0 +1,623 @@
+<?xml version="1.0"?>
+<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0"; xmlns:c="http://www.gtk.org/introspection/c/1.0"; xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
+<include name="GObject" version="2.0"/>
+<package name="libisocodes"/>
+<c:include name="libisocodes.h"/>
+<namespace name="libisocodes" version="1.2.2" c:prefix="libisocodes">
+ <enumeration name="ISOCodesError" c:type="libisocodesISOCodesError" glib:error-domain="libisocodes_iso_codes_error-quark">
+ <member name="cannot_open_file" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_OPEN_FILE" value="0"/>
+ <member name="cannot_create_libxml_structure" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_CREATE_LIBXML_STRUCTURE" value="1"/>
+ <member name="cannot_parse_file" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CANNOT_PARSE_FILE" value="2"/>
+ <member name="file_does_not_contain_iso_data" c:identifier="LIBISOCODES_ISO_CODES_ERROR_FILE_DOES_NOT_CONTAIN_ISO_DATA" value="3"/>
+ <member name="code_not_defined" c:identifier="LIBISOCODES_ISO_CODES_ERROR_CODE_NOT_DEFINED" value="4"/>
+ </enumeration>
+ <class name="ISO_Codes" c:type="libisocodesISO_Codes" glib:type-name="libisocodesISO_Codes" glib:get-type="libisocodes_iso_codes_get_type" glib:type-struct="ISO_CodesClass" parent="GObject.Object" abstract="1">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_CodesPrivate" c:type="libisocodesISO_CodesPrivate*"/>
+ </field>
+ <method name="get_iso_codes_xml_version" c:identifier="libisocodes_iso_codes_get_iso_codes_xml_version" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="utf8" c:type="gchar*"/>
+ </return-value>
+ </method>
+ <method name="get_filepath" c:identifier="libisocodes_iso_codes_get_filepath">
+ <return-value transfer-ownership="full">
+ <type name="utf8" c:type="gchar*"/>
+ </return-value>
+ </method>
+ <method name="set_filepath" c:identifier="libisocodes_iso_codes_set_filepath">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ <parameters>
+ <parameter name="path" transfer-ownership="none" allow-none="1">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_locale" c:identifier="libisocodes_iso_codes_get_locale">
+ <return-value transfer-ownership="full">
+ <type name="utf8" c:type="gchar*"/>
+ </return-value>
+ </method>
+ <method name="set_locale" c:identifier="libisocodes_iso_codes_set_locale">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ <parameters>
+ <parameter name="locale" transfer-ownership="none" allow-none="1">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_CodesClass" c:type="libisocodesISO_CodesClass" glib:is-gtype-struct-for="ISO_Codes">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ <field name="_get_xpaths">
+ <callback name="_get_xpaths" c:type="_get_xpaths">
+ <return-value transfer-ownership="full">
+ <array length="2">
+ <type name="utf8" c:type="gchar*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="self" transfer-ownership="none">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes*"/>
+ </parameter>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </callback>
+ </field>
+ <field name="_get_fields">
+ <callback name="_get_fields" c:type="_get_fields">
+ <return-value transfer-ownership="full">
+ <array length="1">
+ <type name="utf8" c:type="gchar*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="self" transfer-ownership="none">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes*"/>
+ </parameter>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </callback>
+ </field>
+ </record>
+ <record name="ISO_CodesPrivate" c:type="libisocodesISO_CodesPrivate" disguised="1"/>
+ <class name="ISO_3166" c:type="libisocodesISO_3166" glib:type-name="libisocodesISO_3166" glib:get-type="libisocodes_iso_3166_get_type" glib:type-struct="ISO_3166Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_3166Private" c:type="libisocodesISO_3166Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_3166_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_3166" c:type="libisocodesISO_3166*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_3166_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_3166_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_3166_Item" c:type="libisocodesISO_3166_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_3166_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_3166_Item" c:type="libisocodesISO_3166_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_3166Class" c:type="libisocodesISO_3166Class" glib:is-gtype-struct-for="ISO_3166">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_3166Private" c:type="libisocodesISO_3166Private" disguised="1"/>
+ <class name="ISO_3166_Item" c:type="libisocodesISO_3166_Item" glib:type-name="libisocodesISO_3166_Item" glib:get-type="libisocodes_iso_3166_item_get_type" glib:type-struct="ISO_3166_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_3166_ItemPrivate" c:type="libisocodesISO_3166_ItemPrivate*"/>
+ </field>
+ <field name="alpha_2_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="alpha_3_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="numeric_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="official_name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="common_name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_3166_ItemClass" c:type="libisocodesISO_3166_ItemClass" glib:is-gtype-struct-for="ISO_3166_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_3166_ItemPrivate" c:type="libisocodesISO_3166_ItemPrivate" disguised="1"/>
+ <class name="ISO_3166_2" c:type="libisocodesISO_3166_2" glib:type-name="libisocodesISO_3166_2" glib:get-type="libisocodes_iso_3166_2_get_type" glib:type-struct="ISO_3166_2Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_3166_2Private" c:type="libisocodesISO_3166_2Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_3166_2_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_3166_2" c:type="libisocodesISO_3166_2*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_3166_2_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_3166_2_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_3166_2_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_3166_2Class" c:type="libisocodesISO_3166_2Class" glib:is-gtype-struct-for="ISO_3166_2">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_3166_2Private" c:type="libisocodesISO_3166_2Private" disguised="1"/>
+ <class name="ISO_3166_2_Item" c:type="libisocodesISO_3166_2_Item" glib:type-name="libisocodesISO_3166_2_Item" glib:get-type="libisocodes_iso_3166_2_item_get_type" glib:type-struct="ISO_3166_2_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_3166_2_ItemPrivate" c:type="libisocodesISO_3166_2_ItemPrivate*"/>
+ </field>
+ <field name="country">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="type">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="parent">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_3166_2_ItemClass" c:type="libisocodesISO_3166_2_ItemClass" glib:is-gtype-struct-for="ISO_3166_2_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_3166_2_ItemPrivate" c:type="libisocodesISO_3166_2_ItemPrivate" disguised="1"/>
+ <class name="ISO_639" c:type="libisocodesISO_639" glib:type-name="libisocodesISO_639" glib:get-type="libisocodes_iso_639_get_type" glib:type-struct="ISO_639Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639Private" c:type="libisocodesISO_639Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_639_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639" c:type="libisocodesISO_639*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_639_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_639_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_639_Item" c:type="libisocodesISO_639_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_639_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639_Item" c:type="libisocodesISO_639_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_639Class" c:type="libisocodesISO_639Class" glib:is-gtype-struct-for="ISO_639">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_639Private" c:type="libisocodesISO_639Private" disguised="1"/>
+ <class name="ISO_639_Item" c:type="libisocodesISO_639_Item" glib:type-name="libisocodesISO_639_Item" glib:get-type="libisocodes_iso_639_item_get_type" glib:type-struct="ISO_639_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639_ItemPrivate" c:type="libisocodesISO_639_ItemPrivate*"/>
+ </field>
+ <field name="iso_639_2B_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="iso_639_2T_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="iso_639_1_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_639_ItemClass" c:type="libisocodesISO_639_ItemClass" glib:is-gtype-struct-for="ISO_639_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_639_ItemPrivate" c:type="libisocodesISO_639_ItemPrivate" disguised="1"/>
+ <class name="ISO_639_3" c:type="libisocodesISO_639_3" glib:type-name="libisocodesISO_639_3" glib:get-type="libisocodes_iso_639_3_get_type" glib:type-struct="ISO_639_3Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639_3Private" c:type="libisocodesISO_639_3Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_639_3_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639_3" c:type="libisocodesISO_639_3*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_639_3_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_639_3_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_639_3_Item" c:type="libisocodesISO_639_3_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_639_3_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639_3_Item" c:type="libisocodesISO_639_3_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_639_3Class" c:type="libisocodesISO_639_3Class" glib:is-gtype-struct-for="ISO_639_3">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_639_3Private" c:type="libisocodesISO_639_3Private" disguised="1"/>
+ <class name="ISO_639_3_Item" c:type="libisocodesISO_639_3_Item" glib:type-name="libisocodesISO_639_3_Item" glib:get-type="libisocodes_iso_639_3_item_get_type" glib:type-struct="ISO_639_3_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639_3_ItemPrivate" c:type="libisocodesISO_639_3_ItemPrivate*"/>
+ </field>
+ <field name="id">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="part1_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="part2_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="status">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="scope">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="type">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="inverted_name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="reference_name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="common_name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_639_3_ItemClass" c:type="libisocodesISO_639_3_ItemClass" glib:is-gtype-struct-for="ISO_639_3_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_639_3_ItemPrivate" c:type="libisocodesISO_639_3_ItemPrivate" disguised="1"/>
+ <class name="ISO_639_5" c:type="libisocodesISO_639_5" glib:type-name="libisocodesISO_639_5" glib:get-type="libisocodes_iso_639_5_get_type" glib:type-struct="ISO_639_5Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639_5Private" c:type="libisocodesISO_639_5Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_639_5_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639_5" c:type="libisocodesISO_639_5*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_639_5_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_639_5_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_639_5_Item" c:type="libisocodesISO_639_5_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_639_5_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_639_5_Item" c:type="libisocodesISO_639_5_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_639_5Class" c:type="libisocodesISO_639_5Class" glib:is-gtype-struct-for="ISO_639_5">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_639_5Private" c:type="libisocodesISO_639_5Private" disguised="1"/>
+ <class name="ISO_639_5_Item" c:type="libisocodesISO_639_5_Item" glib:type-name="libisocodesISO_639_5_Item" glib:get-type="libisocodes_iso_639_5_item_get_type" glib:type-struct="ISO_639_5_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_639_5_ItemPrivate" c:type="libisocodesISO_639_5_ItemPrivate*"/>
+ </field>
+ <field name="id">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="parents">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_639_5_ItemClass" c:type="libisocodesISO_639_5_ItemClass" glib:is-gtype-struct-for="ISO_639_5_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_639_5_ItemPrivate" c:type="libisocodesISO_639_5_ItemPrivate" disguised="1"/>
+ <class name="ISO_4217" c:type="libisocodesISO_4217" glib:type-name="libisocodesISO_4217" glib:get-type="libisocodes_iso_4217_get_type" glib:type-struct="ISO_4217Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_4217Private" c:type="libisocodesISO_4217Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_4217_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_4217" c:type="libisocodesISO_4217*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_4217_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_4217_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_4217_Item" c:type="libisocodesISO_4217_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_4217_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_4217_Item" c:type="libisocodesISO_4217_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_4217Class" c:type="libisocodesISO_4217Class" glib:is-gtype-struct-for="ISO_4217">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_4217Private" c:type="libisocodesISO_4217Private" disguised="1"/>
+ <class name="ISO_4217_Item" c:type="libisocodesISO_4217_Item" glib:type-name="libisocodesISO_4217_Item" glib:get-type="libisocodes_iso_4217_item_get_type" glib:type-struct="ISO_4217_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_4217_ItemPrivate" c:type="libisocodesISO_4217_ItemPrivate*"/>
+ </field>
+ <field name="letter_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="numeric_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_4217_ItemClass" c:type="libisocodesISO_4217_ItemClass" glib:is-gtype-struct-for="ISO_4217_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_4217_ItemPrivate" c:type="libisocodesISO_4217_ItemPrivate" disguised="1"/>
+ <class name="ISO_15924" c:type="libisocodesISO_15924" glib:type-name="libisocodesISO_15924" glib:get-type="libisocodes_iso_15924_get_type" glib:type-struct="ISO_15924Class" parent="libisocodes.ISO_Codes">
+ <field name="parent_instance">
+ <type name="libisocodes.ISO_Codes" c:type="libisocodesISO_Codes"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_15924Private" c:type="libisocodesISO_15924Private*"/>
+ </field>
+ <constructor name="new" c:identifier="libisocodes_iso_15924_new">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_15924" c:type="libisocodesISO_15924*"/>
+ </return-value>
+ </constructor>
+ <method name="setup" c:identifier="libisocodes_iso_15924_setup">
+ <return-value transfer-ownership="full">
+ <type name="none"/>
+ </return-value>
+ </method>
+ <method name="find_all" c:identifier="libisocodes_iso_15924_find_all" throws="1">
+ <return-value transfer-ownership="full">
+ <array length="0">
+ <type name="libisocodes.ISO_15924_Item" c:type="libisocodesISO_15924_Item*"/>
+ </array>
+ </return-value>
+ <parameters>
+ <parameter name="result_length1" direction="out" transfer-ownership="none">
+ <type name="gint" c:type="gint*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_code" c:identifier="libisocodes_iso_15924_find_code" throws="1">
+ <return-value transfer-ownership="full">
+ <type name="libisocodes.ISO_15924_Item" c:type="libisocodesISO_15924_Item*"/>
+ </return-value>
+ <parameters>
+ <parameter name="code" transfer-ownership="none">
+ <type name="utf8" c:type="const gchar*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="ISO_15924Class" c:type="libisocodesISO_15924Class" glib:is-gtype-struct-for="ISO_15924">
+ <field name="parent_class">
+ <type name="libisocodes.ISO_CodesClass" c:type="libisocodesISO_CodesClass"/>
+ </field>
+ </record>
+ <record name="ISO_15924Private" c:type="libisocodesISO_15924Private" disguised="1"/>
+ <class name="ISO_15924_Item" c:type="libisocodesISO_15924_Item" glib:type-name="libisocodesISO_15924_Item" glib:get-type="libisocodes_iso_15924_item_get_type" glib:type-struct="ISO_15924_ItemClass" parent="GObject.Object">
+ <field name="parent_instance">
+ <type name="GObject.Object" c:type="GObject"/>
+ </field>
+ <field name="priv">
+ <type name="ISO_15924_ItemPrivate" c:type="libisocodesISO_15924_ItemPrivate*"/>
+ </field>
+ <field name="alpha_4_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="numeric_code">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ <field name="name">
+ <type name="utf8" c:type="gchar*"/>
+ </field>
+ </class>
+ <record name="ISO_15924_ItemClass" c:type="libisocodesISO_15924_ItemClass" glib:is-gtype-struct-for="ISO_15924_Item">
+ <field name="parent_class">
+ <type name="GObject.ObjectClass" c:type="GObjectClass"/>
+ </field>
+ </record>
+ <record name="ISO_15924_ItemPrivate" c:type="libisocodesISO_15924_ItemPrivate" disguised="1"/>
+</namespace>
+</repository>
diff -Nru libisocodes-1.2.1/libisocodes.h libisocodes-1.2.2/libisocodes.h
--- libisocodes-1.2.1/libisocodes.h 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/libisocodes.h 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* libisocodes.h generated by valac 0.22.1, the Vala compiler, do not modify */
+/* libisocodes.h generated by valac 0.26.2, the Vala compiler, do not modify */
#ifndef __LIBISOCODES_H__
diff -Nru libisocodes-1.2.1/libisocodes.vapi libisocodes-1.2.2/libisocodes.vapi
--- libisocodes-1.2.1/libisocodes.vapi 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/libisocodes.vapi 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* libisocodes.vapi generated by valac 0.22.1, do not modify. */
+/* libisocodes.vapi generated by valac 0.26.2, do not modify. */
namespace libisocodes {
[CCode (cheader_filename = "libisocodes.h")]
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/cs.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/cs.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/cs.po libisocodes-1.2.2/po/cs.po
--- libisocodes-1.2.1/po/cs.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/cs.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2011-06-02 18:31+0200\n"
"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/da.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/da.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/da.po libisocodes-1.2.2/po/da.po
--- libisocodes-1.2.1/po/da.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/da.po 2015-06-02 23:30:40.000000000 +0200
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2014-01-26 14:44+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/de.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/de.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/de.po libisocodes-1.2.2/po/de.po
--- libisocodes-1.2.1/po/de.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/de.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2014-01-13 13:35+0100\n"
"Last-Translator: Tobias Quathamer <toddy@debian.org>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/en@boldquot.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/en@boldquot.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/en@boldquot.po libisocodes-1.2.2/po/en@boldquot.po
--- libisocodes-1.2.1/po/en@boldquot.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/en@boldquot.po 2015-06-02 23:30:40.000000000 +0200
@@ -1,7 +1,7 @@
# English translations for libisocodes package.
-# Copyright (C) 2014 Tobias Quathamer
+# Copyright (C) 2015 Tobias Quathamer
# This file is distributed under the same license as the libisocodes package.
-# Automatically generated, 2014.
+# Automatically generated, 2015.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: libisocodes 1.2.1\n"
+"Project-Id-Version: libisocodes 1.2.2\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
-"PO-Revision-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
+"PO-Revision-Date: 2015-06-02 23:29+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en@boldquot\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/en@quot.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/en@quot.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/en@quot.po libisocodes-1.2.2/po/en@quot.po
--- libisocodes-1.2.1/po/en@quot.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/en@quot.po 2015-06-02 23:30:40.000000000 +0200
@@ -1,7 +1,7 @@
# English translations for libisocodes package.
-# Copyright (C) 2014 Tobias Quathamer
+# Copyright (C) 2015 Tobias Quathamer
# This file is distributed under the same license as the libisocodes package.
-# Automatically generated, 2014.
+# Automatically generated, 2015.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: libisocodes 1.2.1\n"
+"Project-Id-Version: libisocodes 1.2.2\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
-"PO-Revision-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
+"PO-Revision-Date: 2015-06-02 23:29+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en@quot\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/es.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/es.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/es.po libisocodes-1.2.2/po/es.po
--- libisocodes-1.2.1/po/es.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/es.po 2015-06-02 23:30:40.000000000 +0200
@@ -31,7 +31,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2010-07-17 18:18+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/fr.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/fr.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/fr.po libisocodes-1.2.2/po/fr.po
--- libisocodes-1.2.1/po/fr.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/fr.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2014-01-24 19:04+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
diff -Nru libisocodes-1.2.1/po/libisocodes.pot libisocodes-1.2.2/po/libisocodes.pot
--- libisocodes-1.2.1/po/libisocodes.pot 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/libisocodes.pot 2015-06-02 23:30:40.000000000 +0200
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libisocodes 1.2.1\n"
+"Project-Id-Version: libisocodes 1.2.2\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/pt.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/pt.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/pt.po libisocodes-1.2.2/po/pt.po
--- libisocodes-1.2.1/po/pt.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/pt.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2014-01-20 22:18+0000\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/ru.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/ru.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/ru.po libisocodes-1.2.2/po/ru.po
--- libisocodes-1.2.1/po/ru.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/ru.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2014-01-20 19:15+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/si.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/si.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/si.po libisocodes-1.2.2/po/si.po
--- libisocodes-1.2.1/po/si.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/si.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2011-12-28 06:29+0530\n"
"Last-Translator: Danishka Navin <danishka@gmail.com>\n"
"Language-Team: Sinhala <info@hanthana.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/sv.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/sv.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/sv.po libisocodes-1.2.2/po/sv.po
--- libisocodes-1.2.1/po/sv.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/sv.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2011-06-02 01:45+0100\n"
"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
Binärdateien /tmp/MrYkCLnrbS/libisocodes-1.2.1/po/vi.gmo und /tmp/WE8Lnfawwm/libisocodes-1.2.2/po/vi.gmo sind verschieden.
diff -Nru libisocodes-1.2.1/po/vi.po libisocodes-1.2.2/po/vi.po
--- libisocodes-1.2.1/po/vi.po 2014-07-08 20:21:51.000000000 +0200
+++ libisocodes-1.2.2/po/vi.po 2015-06-02 23:30:40.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libisocodes\n"
"Report-Msgid-Bugs-To: toddy@debian.org\n"
-"POT-Creation-Date: 2014-07-08 20:21+0200\n"
+"POT-Creation-Date: 2015-06-02 23:29+0200\n"
"PO-Revision-Date: 2010-09-30 23:02+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff -Nru libisocodes-1.2.1/src/exceptions.c libisocodes-1.2.2/src/exceptions.c
--- libisocodes-1.2.1/src/exceptions.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/exceptions.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* exceptions.c generated by valac 0.22.1, the Vala compiler
+/* exceptions.c generated by valac 0.26.2, the Vala compiler
* generated from exceptions.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_15924.c libisocodes-1.2.2/src/iso_15924.c
--- libisocodes-1.2.1/src/iso_15924.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_15924.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_15924.c generated by valac 0.22.1, the Vala compiler
+/* iso_15924.c generated by valac 0.26.2, the Vala compiler
* generated from iso_15924.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -196,7 +196,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -285,7 +285,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -327,15 +327,13 @@
gboolean _tmp8_ = FALSE;
glong _tmp9_ = 0L;
gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
- glong _tmp14_ = 0L;
- gboolean _tmp17_ = FALSE;
+ glong _tmp13_ = 0L;
+ glong _tmp16_ = 0L;
+ glong _tmp17_ = 0L;
glong _tmp18_ = 0L;
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- glong _tmp22_ = 0L;
- gchar* _tmp23_ = NULL;
+ gchar* _tmp21_ = NULL;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = strlen (self);
_tmp1_ = _tmp0_;
@@ -366,28 +364,26 @@
} else {
_tmp8_ = FALSE;
}
- _tmp12_ = _tmp8_;
- g_return_val_if_fail (_tmp12_, NULL);
- _tmp14_ = end;
- if (_tmp14_ >= ((glong) 0)) {
+ g_return_val_if_fail (_tmp8_, NULL);
+ _tmp13_ = end;
+ if (_tmp13_ >= ((glong) 0)) {
+ glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
- _tmp15_ = end;
- _tmp16_ = string_length;
- _tmp13_ = _tmp15_ <= _tmp16_;
+ _tmp14_ = end;
+ _tmp15_ = string_length;
+ _tmp12_ = _tmp14_ <= _tmp15_;
} else {
- _tmp13_ = FALSE;
+ _tmp12_ = FALSE;
}
- _tmp17_ = _tmp13_;
- g_return_val_if_fail (_tmp17_, NULL);
+ g_return_val_if_fail (_tmp12_, NULL);
+ _tmp16_ = start;
+ _tmp17_ = end;
+ g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
_tmp18_ = start;
_tmp19_ = end;
- g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
_tmp20_ = start;
- _tmp21_ = end;
- _tmp22_ = start;
- _tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
- result = _tmp23_;
+ _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
+ result = _tmp21_;
return result;
}
@@ -536,8 +532,8 @@
static void libisocodes_iso_15924_class_init (libisocodesISO_15924Class * klass) {
libisocodes_iso_15924_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_15924_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_15924_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_15924_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_15924_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_15924_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_15924_item.c libisocodes-1.2.2/src/iso_15924_item.c
--- libisocodes-1.2.1/src/iso_15924_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_15924_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_15924_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_15924_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_15924_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_3166_2.c libisocodes-1.2.2/src/iso_3166_2.c
--- libisocodes-1.2.1/src/iso_3166_2.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_3166_2.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_3166_2.c generated by valac 0.22.1, the Vala compiler
+/* iso_3166_2.c generated by valac 0.26.2, the Vala compiler
* generated from iso_3166_2.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -194,7 +194,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -283,7 +283,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -391,8 +391,8 @@
static void libisocodes_iso_3166_2_class_init (libisocodesISO_3166_2Class * klass) {
libisocodes_iso_3166_2_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_3166_2_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_3166_2_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_3166_2_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_3166_2_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_3166_2_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_3166_2_item.c libisocodes-1.2.2/src/iso_3166_2_item.c
--- libisocodes-1.2.1/src/iso_3166_2_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_3166_2_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_3166_2_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_3166_2_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_3166_2_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_3166.c libisocodes-1.2.2/src/iso_3166.c
--- libisocodes-1.2.1/src/iso_3166.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_3166.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_3166.c generated by valac 0.22.1, the Vala compiler
+/* iso_3166.c generated by valac 0.26.2, the Vala compiler
* generated from iso_3166.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -197,7 +197,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -286,7 +286,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -477,8 +477,8 @@
static void libisocodes_iso_3166_class_init (libisocodesISO_3166Class * klass) {
libisocodes_iso_3166_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_3166_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_3166_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_3166_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_3166_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_3166_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_3166_item.c libisocodes-1.2.2/src/iso_3166_item.c
--- libisocodes-1.2.1/src/iso_3166_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_3166_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_3166_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_3166_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_3166_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_4217.c libisocodes-1.2.2/src/iso_4217.c
--- libisocodes-1.2.1/src/iso_4217.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_4217.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_4217.c generated by valac 0.22.1, the Vala compiler
+/* iso_4217.c generated by valac 0.26.2, the Vala compiler
* generated from iso_4217.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -196,7 +196,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -285,7 +285,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -429,8 +429,8 @@
static void libisocodes_iso_4217_class_init (libisocodesISO_4217Class * klass) {
libisocodes_iso_4217_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_4217_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_4217_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_4217_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_4217_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_4217_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_4217_item.c libisocodes-1.2.2/src/iso_4217_item.c
--- libisocodes-1.2.1/src/iso_4217_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_4217_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_4217_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_4217_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_4217_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_639_3.c libisocodes-1.2.2/src/iso_639_3.c
--- libisocodes-1.2.1/src/iso_639_3.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639_3.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639_3.c generated by valac 0.22.1, the Vala compiler
+/* iso_639_3.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639_3.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -196,7 +196,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -285,7 +285,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -481,8 +481,8 @@
static void libisocodes_iso_639_3_class_init (libisocodesISO_639_3Class * klass) {
libisocodes_iso_639_3_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_639_3_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_639_3_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_639_3_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_639_3_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_639_3_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_639_3_item.c libisocodes-1.2.2/src/iso_639_3_item.c
--- libisocodes-1.2.1/src/iso_639_3_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639_3_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639_3_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_639_3_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639_3_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_639_5.c libisocodes-1.2.2/src/iso_639_5.c
--- libisocodes-1.2.1/src/iso_639_5.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639_5.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639_5.c generated by valac 0.22.1, the Vala compiler
+/* iso_639_5.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639_5.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -194,7 +194,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -283,7 +283,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -391,8 +391,8 @@
static void libisocodes_iso_639_5_class_init (libisocodesISO_639_5Class * klass) {
libisocodes_iso_639_5_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_639_5_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_639_5_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_639_5_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_639_5_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_639_5_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_639_5_item.c libisocodes-1.2.2/src/iso_639_5_item.c
--- libisocodes-1.2.1/src/iso_639_5_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639_5_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639_5_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_639_5_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639_5_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/iso_639.c libisocodes-1.2.2/src/iso_639.c
--- libisocodes-1.2.1/src/iso_639.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639.c generated by valac 0.22.1, the Vala compiler
+/* iso_639.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -196,7 +196,7 @@
__result__size_ = _result__length1;
_tmp0_ = _libisocodes_iso_codes_find_all ((libisocodesISO_Codes*) self, &_inner_error_);
items = _tmp0_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
@@ -285,7 +285,7 @@
_tmp0_ = code;
_tmp1_ = _libisocodes_iso_codes_find_code ((libisocodesISO_Codes*) self, _tmp0_, &_inner_error_);
res = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -463,8 +463,8 @@
static void libisocodes_iso_639_class_init (libisocodesISO_639Class * klass) {
libisocodes_iso_639_parent_class = g_type_class_peek_parent (klass);
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_639_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_639_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_639_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_639_real__get_fields;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_639_finalize;
}
diff -Nru libisocodes-1.2.1/src/iso_639_item.c libisocodes-1.2.2/src/iso_639_item.c
--- libisocodes-1.2.1/src/iso_639_item.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/iso_639_item.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* iso_639_item.c generated by valac 0.22.1, the Vala compiler
+/* iso_639_item.c generated by valac 0.26.2, the Vala compiler
* generated from iso_639_item.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
diff -Nru libisocodes-1.2.1/src/isocodes.c libisocodes-1.2.2/src/isocodes.c
--- libisocodes-1.2.1/src/isocodes.c 2014-07-08 20:22:36.000000000 +0200
+++ libisocodes-1.2.2/src/isocodes.c 2015-06-02 23:32:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* isocodes.c generated by valac 0.22.1, the Vala compiler
+/* isocodes.c generated by valac 0.26.2, the Vala compiler
* generated from isocodes.vala, do not modify */
/* Copyright © 2012-2013 Tobias Quathamer
@@ -132,7 +132,7 @@
_tmp0_ = self->priv->_iso_codes_xml_version;
if (g_strcmp0 (_tmp0_, "") == 0) {
_libisocodes_iso_codes_open_file (self, "", &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
return NULL;
@@ -180,11 +180,10 @@
void libisocodes_iso_codes_set_filepath (libisocodesISO_Codes* self, const gchar* path) {
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_ = NULL;
- gboolean _tmp3_ = FALSE;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- xmlDoc* _tmp6_ = NULL;
- xmlParserCtxt* _tmp8_ = NULL;
+ const gchar* _tmp3_ = NULL;
+ gchar* _tmp4_ = NULL;
+ xmlDoc* _tmp5_ = NULL;
+ xmlParserCtxt* _tmp7_ = NULL;
g_return_if_fail (self != NULL);
_tmp1_ = path;
if (_tmp1_ == NULL) {
@@ -194,26 +193,25 @@
_tmp2_ = path;
_tmp0_ = g_strcmp0 (_tmp2_, "") == 0;
}
- _tmp3_ = _tmp0_;
- if (_tmp3_) {
+ if (_tmp0_) {
return;
}
- _tmp4_ = path;
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp3_ = path;
+ _tmp4_ = g_strdup (_tmp3_);
_g_free0 (self->priv->_filepath);
- self->priv->_filepath = _tmp5_;
- _tmp6_ = self->priv->_xml;
- if (_tmp6_ != NULL) {
- xmlDoc* _tmp7_ = NULL;
- _tmp7_ = self->priv->_xml;
- xmlFreeDoc (_tmp7_);
+ self->priv->_filepath = _tmp4_;
+ _tmp5_ = self->priv->_xml;
+ if (_tmp5_ != NULL) {
+ xmlDoc* _tmp6_ = NULL;
+ _tmp6_ = self->priv->_xml;
+ xmlFreeDoc (_tmp6_);
self->priv->_xml = NULL;
}
- _tmp8_ = self->priv->_ctx;
- if (_tmp8_ != NULL) {
- xmlParserCtxt* _tmp9_ = NULL;
- _tmp9_ = self->priv->_ctx;
- xmlFreeParserCtxt (_tmp9_);
+ _tmp7_ = self->priv->_ctx;
+ if (_tmp7_ != NULL) {
+ xmlParserCtxt* _tmp8_ = NULL;
+ _tmp8_ = self->priv->_ctx;
+ xmlFreeParserCtxt (_tmp8_);
self->priv->_ctx = NULL;
}
}
@@ -295,6 +293,7 @@
GRegex* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
+ gchar* _tmp9_ = NULL;
_tmp0_ = old;
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
_tmp2_ = _tmp1_;
@@ -302,7 +301,7 @@
_tmp4_ = _tmp3_;
_g_free0 (_tmp2_);
regex = _tmp4_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == G_REGEX_ERROR) {
goto __catch0_g_regex_error;
}
@@ -314,7 +313,7 @@
_tmp7_ = replacement;
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
_tmp5_ = _tmp8_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_regex_unref0 (regex);
if (_inner_error_->domain == G_REGEX_ERROR) {
goto __catch0_g_regex_error;
@@ -324,7 +323,10 @@
g_clear_error (&_inner_error_);
return NULL;
}
- result = _tmp5_;
+ _tmp9_ = _tmp5_;
+ _tmp5_ = NULL;
+ result = _tmp9_;
+ _g_free0 (_tmp5_);
_g_regex_unref0 (regex);
return result;
}
@@ -338,7 +340,7 @@
_g_error_free0 (e);
}
__finally0:
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return NULL;
@@ -586,7 +588,7 @@
_tmp8_ = self->priv->_xml;
if (_tmp8_ == NULL) {
_libisocodes_iso_codes_open_file (self, "", &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_g_free0 (xpath);
@@ -624,142 +626,138 @@
gboolean _tmp19_ = FALSE;
_tmp19_ = TRUE;
while (TRUE) {
- gboolean _tmp20_ = FALSE;
- gint _tmp22_ = 0;
- xmlNodeSet* _tmp23_ = NULL;
- gint _tmp24_ = 0;
+ gint _tmp21_ = 0;
+ xmlNodeSet* _tmp22_ = NULL;
+ gint _tmp23_ = 0;
xmlNode* node = NULL;
- xmlNodeSet* _tmp25_ = NULL;
- gint _tmp26_ = 0;
- xmlNode* _tmp27_ = NULL;
+ xmlNodeSet* _tmp24_ = NULL;
+ gint _tmp25_ = 0;
+ xmlNode* _tmp26_ = NULL;
GeeHashMap* item = NULL;
- GeeHashMap* _tmp28_ = NULL;
- gchar** _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- const gchar* _tmp44_ = NULL;
- gboolean _tmp56_ = FALSE;
- const gchar* _tmp57_ = NULL;
- gboolean _tmp59_ = FALSE;
- GeeArrayList* _tmp62_ = NULL;
- GeeHashMap* _tmp63_ = NULL;
- _tmp20_ = _tmp19_;
- if (!_tmp20_) {
- gint _tmp21_ = 0;
- _tmp21_ = i;
- i = _tmp21_ + 1;
+ GeeHashMap* _tmp27_ = NULL;
+ gchar** _tmp28_ = NULL;
+ gint _tmp28__length1 = 0;
+ const gchar* _tmp43_ = NULL;
+ gboolean _tmp55_ = FALSE;
+ const gchar* _tmp56_ = NULL;
+ GeeArrayList* _tmp60_ = NULL;
+ GeeHashMap* _tmp61_ = NULL;
+ if (!_tmp19_) {
+ gint _tmp20_ = 0;
+ _tmp20_ = i;
+ i = _tmp20_ + 1;
}
_tmp19_ = FALSE;
- _tmp22_ = i;
- _tmp23_ = nodeset;
- _tmp24_ = xmlXPathNodeSetGetLength (_tmp23_);
- if (!(_tmp22_ < _tmp24_)) {
+ _tmp21_ = i;
+ _tmp22_ = nodeset;
+ _tmp23_ = xmlXPathNodeSetGetLength (_tmp22_);
+ if (!(_tmp21_ < _tmp23_)) {
break;
}
- _tmp25_ = nodeset;
- _tmp26_ = i;
- _tmp27_ = xmlXPathNodeSetItem (_tmp25_, _tmp26_);
- node = _tmp27_;
- _tmp28_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
- item = _tmp28_;
- _tmp29_ = fields;
- _tmp29__length1 = fields_length1;
+ _tmp24_ = nodeset;
+ _tmp25_ = i;
+ _tmp26_ = xmlXPathNodeSetItem (_tmp24_, _tmp25_);
+ node = _tmp26_;
+ _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ item = _tmp27_;
+ _tmp28_ = fields;
+ _tmp28__length1 = fields_length1;
{
gchar** field_collection = NULL;
gint field_collection_length1 = 0;
gint _field_collection_size_ = 0;
gint field_it = 0;
- field_collection = _tmp29_;
- field_collection_length1 = _tmp29__length1;
- for (field_it = 0; field_it < _tmp29__length1; field_it = field_it + 1) {
- gchar* _tmp30_ = NULL;
+ field_collection = _tmp28_;
+ field_collection_length1 = _tmp28__length1;
+ for (field_it = 0; field_it < _tmp28__length1; field_it = field_it + 1) {
+ gchar* _tmp29_ = NULL;
gchar* field = NULL;
- _tmp30_ = g_strdup (field_collection[field_it]);
- field = _tmp30_;
+ _tmp29_ = g_strdup (field_collection[field_it]);
+ field = _tmp29_;
{
- GeeHashMap* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
- xmlNode* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
+ GeeHashMap* _tmp30_ = NULL;
+ const gchar* _tmp31_ = NULL;
+ xmlNode* _tmp32_ = NULL;
+ const gchar* _tmp33_ = NULL;
+ gchar* _tmp34_ = NULL;
gchar* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
- GeeHashMap* _tmp37_ = NULL;
- const gchar* _tmp38_ = NULL;
- gpointer _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
- _tmp31_ = item;
- _tmp32_ = field;
- _tmp33_ = node;
- _tmp34_ = field;
- _tmp35_ = (gchar*) xmlGetProp (_tmp33_, (xmlChar*) _tmp34_);
- _tmp36_ = _tmp35_;
- gee_abstract_map_set ((GeeAbstractMap*) _tmp31_, _tmp32_, _tmp36_);
- _g_free0 (_tmp36_);
- _tmp37_ = item;
- _tmp38_ = field;
- _tmp39_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp37_, _tmp38_);
- _tmp40_ = (gchar*) _tmp39_;
- _tmp41_ = _tmp40_ == NULL;
- _g_free0 (_tmp40_);
- if (_tmp41_) {
- GeeHashMap* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
- _tmp42_ = item;
- _tmp43_ = field;
- gee_abstract_map_set ((GeeAbstractMap*) _tmp42_, _tmp43_, "");
+ GeeHashMap* _tmp36_ = NULL;
+ const gchar* _tmp37_ = NULL;
+ gpointer _tmp38_ = NULL;
+ gchar* _tmp39_ = NULL;
+ gboolean _tmp40_ = FALSE;
+ _tmp30_ = item;
+ _tmp31_ = field;
+ _tmp32_ = node;
+ _tmp33_ = field;
+ _tmp34_ = (gchar*) xmlGetProp (_tmp32_, (xmlChar*) _tmp33_);
+ _tmp35_ = _tmp34_;
+ gee_abstract_map_set ((GeeAbstractMap*) _tmp30_, _tmp31_, _tmp35_);
+ _g_free0 (_tmp35_);
+ _tmp36_ = item;
+ _tmp37_ = field;
+ _tmp38_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp36_, _tmp37_);
+ _tmp39_ = (gchar*) _tmp38_;
+ _tmp40_ = _tmp39_ == NULL;
+ _g_free0 (_tmp39_);
+ if (_tmp40_) {
+ GeeHashMap* _tmp41_ = NULL;
+ const gchar* _tmp42_ = NULL;
+ _tmp41_ = item;
+ _tmp42_ = field;
+ gee_abstract_map_set ((GeeAbstractMap*) _tmp41_, _tmp42_, "");
}
_g_free0 (field);
}
}
}
- _tmp44_ = self->priv->_standard;
- if (g_strcmp0 (_tmp44_, "3166-2") == 0) {
- GeeHashMap* _tmp45_ = NULL;
+ _tmp43_ = self->priv->_standard;
+ if (g_strcmp0 (_tmp43_, "3166-2") == 0) {
+ GeeHashMap* _tmp44_ = NULL;
+ xmlNode* _tmp45_ = NULL;
xmlNode* _tmp46_ = NULL;
xmlNode* _tmp47_ = NULL;
- xmlNode* _tmp48_ = NULL;
+ gchar* _tmp48_ = NULL;
gchar* _tmp49_ = NULL;
- gchar* _tmp50_ = NULL;
- GeeHashMap* _tmp51_ = NULL;
+ GeeHashMap* _tmp50_ = NULL;
+ xmlNode* _tmp51_ = NULL;
xmlNode* _tmp52_ = NULL;
- xmlNode* _tmp53_ = NULL;
+ gchar* _tmp53_ = NULL;
gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
- _tmp45_ = item;
- _tmp46_ = node;
+ _tmp44_ = item;
+ _tmp45_ = node;
+ _tmp46_ = _tmp45_->parent;
_tmp47_ = _tmp46_->parent;
- _tmp48_ = _tmp47_->parent;
- _tmp49_ = (gchar*) xmlGetProp (_tmp48_, (xmlChar*) "code");
- _tmp50_ = _tmp49_;
- gee_abstract_map_set ((GeeAbstractMap*) _tmp45_, "country", _tmp50_);
- _g_free0 (_tmp50_);
- _tmp51_ = item;
- _tmp52_ = node;
- _tmp53_ = _tmp52_->parent;
- _tmp54_ = (gchar*) xmlGetProp (_tmp53_, (xmlChar*) "type");
- _tmp55_ = _tmp54_;
- gee_abstract_map_set ((GeeAbstractMap*) _tmp51_, "type", _tmp55_);
- _g_free0 (_tmp55_);
+ _tmp48_ = (gchar*) xmlGetProp (_tmp47_, (xmlChar*) "code");
+ _tmp49_ = _tmp48_;
+ gee_abstract_map_set ((GeeAbstractMap*) _tmp44_, "country", _tmp49_);
+ _g_free0 (_tmp49_);
+ _tmp50_ = item;
+ _tmp51_ = node;
+ _tmp52_ = _tmp51_->parent;
+ _tmp53_ = (gchar*) xmlGetProp (_tmp52_, (xmlChar*) "type");
+ _tmp54_ = _tmp53_;
+ gee_abstract_map_set ((GeeAbstractMap*) _tmp50_, "type", _tmp54_);
+ _g_free0 (_tmp54_);
}
- _tmp57_ = self->priv->_locale;
- if (_tmp57_ != NULL) {
- const gchar* _tmp58_ = NULL;
- _tmp58_ = self->priv->_locale;
- _tmp56_ = g_strcmp0 (_tmp58_, "") != 0;
+ _tmp56_ = self->priv->_locale;
+ if (_tmp56_ != NULL) {
+ const gchar* _tmp57_ = NULL;
+ _tmp57_ = self->priv->_locale;
+ _tmp55_ = g_strcmp0 (_tmp57_, "") != 0;
} else {
- _tmp56_ = FALSE;
+ _tmp55_ = FALSE;
}
- _tmp59_ = _tmp56_;
- if (_tmp59_) {
- GeeHashMap* _tmp60_ = NULL;
- const gchar* _tmp61_ = NULL;
- _tmp60_ = item;
- _tmp61_ = self->priv->_locale;
- _libisocodes_iso_codes_translate (self, _tmp60_, _tmp61_);
+ if (_tmp55_) {
+ GeeHashMap* _tmp58_ = NULL;
+ const gchar* _tmp59_ = NULL;
+ _tmp58_ = item;
+ _tmp59_ = self->priv->_locale;
+ _libisocodes_iso_codes_translate (self, _tmp58_, _tmp59_);
}
- _tmp62_ = _result_;
- _tmp63_ = item;
- gee_abstract_collection_add ((GeeAbstractCollection*) _tmp62_, _tmp63_);
+ _tmp60_ = _result_;
+ _tmp61_ = item;
+ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp60_, _tmp61_);
_g_object_unref0 (item);
}
}
@@ -798,7 +796,6 @@
gboolean _tmp48_ = FALSE;
gboolean _tmp58_ = FALSE;
const gchar* _tmp59_ = NULL;
- gboolean _tmp61_ = FALSE;
GError * _inner_error_ = NULL;
g_return_val_if_fail (self != NULL, NULL);
g_return_val_if_fail (code != NULL, NULL);
@@ -808,7 +805,7 @@
_tmp1_ = self->priv->_xml;
if (_tmp1_ == NULL) {
_libisocodes_iso_codes_open_file (self, "", &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
if (_inner_error_->domain == LIBISOCODES_ISO_CODES_ERROR) {
g_propagate_error (error, _inner_error_);
_g_object_unref0 (_result_);
@@ -1018,13 +1015,12 @@
} else {
_tmp58_ = FALSE;
}
- _tmp61_ = _tmp58_;
- if (_tmp61_) {
- GeeHashMap* _tmp62_ = NULL;
- const gchar* _tmp63_ = NULL;
- _tmp62_ = _result_;
- _tmp63_ = self->priv->_locale;
- _libisocodes_iso_codes_translate (self, _tmp62_, _tmp63_);
+ if (_tmp58_) {
+ GeeHashMap* _tmp61_ = NULL;
+ const gchar* _tmp62_ = NULL;
+ _tmp61_ = _result_;
+ _tmp62_ = self->priv->_locale;
+ _libisocodes_iso_codes_translate (self, _tmp61_, _tmp62_);
}
result = _result_;
xpaths = (_vala_array_free (xpaths, xpaths_length1, (GDestroyNotify) g_free), NULL);
@@ -1065,7 +1061,7 @@
gchar* _tmp15_ = NULL;
gchar** _tmp16_ = NULL;
gint _tmp16__length1 = 0;
- const gchar* _tmp35_ = NULL;
+ const gchar* _tmp34_ = NULL;
const gchar* _tmp36_ = NULL;
g_return_if_fail (self != NULL);
g_return_if_fail (item != NULL);
@@ -1119,7 +1115,6 @@
GeeHashMap* _tmp19_ = NULL;
const gchar* _tmp20_ = NULL;
gboolean _tmp21_ = FALSE;
- gboolean _tmp26_ = FALSE;
_tmp19_ = item;
_tmp20_ = field;
_tmp21_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp19_, _tmp20_);
@@ -1137,33 +1132,38 @@
} else {
_tmp18_ = FALSE;
}
- _tmp26_ = _tmp18_;
- if (_tmp26_) {
- GeeHashMap* _tmp27_ = NULL;
+ if (_tmp18_) {
+ GeeHashMap* _tmp26_ = NULL;
+ const gchar* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- GeeHashMap* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gpointer _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- _tmp27_ = item;
- _tmp28_ = field;
- _tmp29_ = domain;
- _tmp30_ = item;
- _tmp31_ = field;
- _tmp32_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp30_, _tmp31_);
- _tmp33_ = (gchar*) _tmp32_;
- _tmp34_ = g_dgettext (_tmp29_, _tmp33_);
- gee_abstract_map_set ((GeeAbstractMap*) _tmp27_, _tmp28_, _tmp34_);
- _g_free0 (_tmp33_);
+ GeeHashMap* _tmp29_ = NULL;
+ const gchar* _tmp30_ = NULL;
+ gpointer _tmp31_ = NULL;
+ gchar* _tmp32_ = NULL;
+ const gchar* _tmp33_ = NULL;
+ _tmp26_ = item;
+ _tmp27_ = field;
+ _tmp28_ = domain;
+ _tmp29_ = item;
+ _tmp30_ = field;
+ _tmp31_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp29_, _tmp30_);
+ _tmp32_ = (gchar*) _tmp31_;
+ _tmp33_ = g_dgettext (_tmp28_, _tmp32_);
+ gee_abstract_map_set ((GeeAbstractMap*) _tmp26_, _tmp27_, _tmp33_);
+ _g_free0 (_tmp32_);
}
_g_free0 (field);
}
}
}
- _tmp35_ = env_backup;
- g_setenv ("LANGUAGE", _tmp35_, TRUE);
+ _tmp34_ = env_backup;
+ if (_tmp34_ == NULL) {
+ g_unsetenv ("LANGUAGE");
+ } else {
+ const gchar* _tmp35_ = NULL;
+ _tmp35_ = env_backup;
+ g_setenv ("LANGUAGE", _tmp35_, TRUE);
+ }
_tmp36_ = loc_backup;
setlocale (LC_ALL, _tmp36_);
_g_free0 (domain);
@@ -1302,8 +1302,8 @@
static void libisocodes_iso_codes_class_init (libisocodesISO_CodesClass * klass) {
libisocodes_iso_codes_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (libisocodesISO_CodesPrivate));
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_xpaths = libisocodes_iso_codes_real__get_xpaths;
- LIBISOCODES_ISO_CODES_CLASS (klass)->_get_fields = libisocodes_iso_codes_real__get_fields;
+ ((libisocodesISO_CodesClass *) klass)->_get_xpaths = libisocodes_iso_codes_real__get_xpaths;
+ ((libisocodesISO_CodesClass *) klass)->_get_fields = libisocodes_iso_codes_real__get_fields;
G_OBJECT_CLASS (klass)->get_property = _vala_libisocodes_iso_codes_get_property;
G_OBJECT_CLASS (klass)->set_property = _vala_libisocodes_iso_codes_set_property;
G_OBJECT_CLASS (klass)->finalize = libisocodes_iso_codes_finalize;
diff -Nru libisocodes-1.2.1/src/isocodes.vala libisocodes-1.2.2/src/isocodes.vala
--- libisocodes-1.2.1/src/isocodes.vala 2014-01-21 12:35:06.000000000 +0100
+++ libisocodes-1.2.2/src/isocodes.vala 2015-06-02 17:03:30.000000000 +0200
@@ -331,8 +331,14 @@
item[field] = dgettext(domain, item[field]);
}
}
- // Restore the environment from backup
- Environment.set_variable("LANGUAGE", env_backup, true);
+ // Restore the environment variable LANGUAGE, either
+ // to the previous value or unset the variable.
+ if (env_backup == null) {
+ Environment.unset_variable("LANGUAGE");
+ }
+ else {
+ Environment.set_variable("LANGUAGE", env_backup, true);
+ }
// Restore the locale from backup
Intl.setlocale(LocaleCategory.ALL, loc_backup);
}
Attachment:
signature.asc
Description: OpenPGP digital signature