Commit 4c633ff0 authored by Matthias Clasen's avatar Matthias Clasen

2.22.0

parent 9203da30
...@@ -34,7 +34,7 @@ Notes about GLib 2.22 ...@@ -34,7 +34,7 @@ Notes about GLib 2.22
Notes about GLib 2.20 Notes about GLib 2.20
===================== =====================
^ The functions for launching applications (e.g. g_app_info_launch() + * The functions for launching applications (e.g. g_app_info_launch() +
friends) now passes a FUSE file:// URI if possible (requires gvfs friends) now passes a FUSE file:// URI if possible (requires gvfs
with the FUSE daemon to be running and operational). With gvfs 2.26, with the FUSE daemon to be running and operational). With gvfs 2.26,
FUSE file:// URIs will be mapped back to gio URIs in the GFile FUSE file:// URIs will be mapped back to gio URIs in the GFile
......
...@@ -900,73 +900,6 @@ Turns the argument into a string literal by using the '#' stringizing operator. ...@@ -900,73 +900,6 @@ Turns the argument into a string literal by using the '#' stringizing operator.
</para> </para>
<!-- ##### VARIABLE glib_binary_age ##### -->
<para>
This is the binary age passed to <application>libtool</application>. If
<application>libtool</application> means nothing to you, don't worry
about it. ;-)
</para>
<!-- ##### FUNCTION glib_check_version ##### -->
<para>
</para>
@required_major:
@required_minor:
@required_micro:
@Returns:
<!-- ##### VARIABLE glib_interface_age ##### -->
<para>
This is the interface age passed to <application>libtool</application>. If
<application>libtool</application> means nothing to you, don't worry
about it. ;-)
</para>
<!-- ##### VARIABLE glib_major_version ##### -->
<para>
The major version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 1.)
</para>
<para>
This variable is in the library, so represents the
GLib library you have linked against. Contrast with the
#GLIB_MAJOR_VERSION macro, which represents the major version of the
GLib headers you have included.
</para>
<!-- ##### VARIABLE glib_micro_version ##### -->
<para>
The micro version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 5.)
</para>
<para>
This variable is in the library, so represents the GLib library you
have linked against. Contrast with the #GLIB_MICRO_VERSION macro, which
represents the micro version of the GLib headers you have included.
</para>
<!-- ##### VARIABLE glib_minor_version ##### -->
<para>
The minor version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 2.)
</para>
<para>
This variable is in the library, so represents the
GLib library you have linked against. Contrast with the
#GLIB_MINOR_VERSION macro, which represents the minor version of the
GLib headers you have included.
</para>
<!-- ##### MACRO lseek ##### --> <!-- ##### MACRO lseek ##### -->
<para> <para>
......
...@@ -403,7 +403,7 @@ Since: 2.14 ...@@ -403,7 +403,7 @@ Since: 2.14
<!-- ##### MACRO G_LIKELY ##### --> <!-- ##### FUNCTION G_LIKELY ##### -->
<para> <para>
Hints the compiler that the expression is likely to evaluate to a true Hints the compiler that the expression is likely to evaluate to a true
value. The compiler may use this information for optimizations. value. The compiler may use this information for optimizations.
...@@ -413,9 +413,10 @@ if (G_LIKELY (random () != 1)) ...@@ -413,9 +413,10 @@ if (G_LIKELY (random () != 1))
g_print ("not one"); g_print ("not one");
</programlisting></informalexample> </programlisting></informalexample>
@expr: the expression
@Returns: the value of @expr @Returns: the value of @expr
@Since: 2.2 @Since: 2.2
<!-- # Unused Parameters # -->
@expr: the expression
<!-- ##### MACRO G_UNLIKELY ##### --> <!-- ##### MACRO G_UNLIKELY ##### -->
......
...@@ -769,6 +769,13 @@ you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and for writing you would use ...@@ -769,6 +769,13 @@ you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and for writing you would use
@Returns: @Returns:
<!-- ##### MACRO G_POLLFD_FORMAT ##### -->
<para>
</para>
<!-- ##### STRUCT GSource ##### --> <!-- ##### STRUCT GSource ##### -->
<para> <para>
The <structname>GSource</structname> struct is an opaque data type representing The <structname>GSource</structname> struct is an opaque data type representing
......
...@@ -203,6 +203,27 @@ Returns %TRUE if tests are run in quiet mode. ...@@ -203,6 +203,27 @@ Returns %TRUE if tests are run in quiet mode.
@bug_uri_snippet: @bug_uri_snippet:
<!-- ##### USER_FUNCTION GTestLogFatalFunc ##### -->
<para>
</para>
@log_domain:
@log_level:
@message:
@user_data:
@Returns:
<!-- ##### FUNCTION g_test_log_set_fatal_handler ##### -->
<para>
</para>
@log_func:
@user_data:
<!-- ##### FUNCTION g_test_timer_start ##### --> <!-- ##### FUNCTION g_test_timer_start ##### -->
<para> <para>
......
...@@ -19,6 +19,74 @@ typically use the features described here. ...@@ -19,6 +19,74 @@ typically use the features described here.
<!-- ##### SECTION Stability_Level ##### --> <!-- ##### SECTION Stability_Level ##### -->
<!-- ##### VARIABLE glib_major_version ##### -->
<para>
The major version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 1.)
</para>
<para>
This variable is in the library, so represents the
GLib library you have linked against. Contrast with the
#GLIB_MAJOR_VERSION macro, which represents the major version of the
GLib headers you have included.
</para>
<!-- ##### VARIABLE glib_minor_version ##### -->
<para>
The minor version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 2.)
</para>
<para>
This variable is in the library, so represents the
GLib library you have linked against. Contrast with the
#GLIB_MINOR_VERSION macro, which represents the minor version of the
GLib headers you have included.
</para>
<!-- ##### VARIABLE glib_micro_version ##### -->
<para>
The micro version number of the GLib library.
(e.g. in GLib version 1.2.5 this is 5.)
</para>
<para>
This variable is in the library, so represents the GLib library you
have linked against. Contrast with the #GLIB_MICRO_VERSION macro, which
represents the micro version of the GLib headers you have included.
</para>
<!-- ##### VARIABLE glib_binary_age ##### -->
<para>
This is the binary age passed to <application>libtool</application>. If
<application>libtool</application> means nothing to you, don't worry
about it. ;-)
</para>
<!-- ##### VARIABLE glib_interface_age ##### -->
<para>
This is the interface age passed to <application>libtool</application>. If
<application>libtool</application> means nothing to you, don't worry
about it. ;-)
</para>
<!-- ##### FUNCTION glib_check_version ##### -->
<para>
</para>
@required_major:
@required_minor:
@required_micro:
@Returns:
<!-- ##### MACRO GLIB_MAJOR_VERSION ##### --> <!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
<para> <para>
The major version number of the GLib library. The major version number of the GLib library.
......
...@@ -366,12 +366,17 @@ dist-hook: $(BUILT_EXTRA_DIST) ...@@ -366,12 +366,17 @@ dist-hook: $(BUILT_EXTRA_DIST)
if test -f $$f; then d=.; else d=$(srcdir); fi; \ if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done cp $$d/$$f $(distdir) || exit 1; done
distclean-local:
if test $(srcdir) = .; then :; else \
rm -f libglib-gdb.py; \
fi
# install gdb scripts # install gdb scripts
gdbdir = $(datadir)/glib-2.0/gdb gdbdir = $(datadir)/glib-2.0/gdb
gdb_SCRIPTS = glib.py dist_gdb_SCRIPTS = glib.py
libglib-gdb.py: libglib-gdb.py.in libglib-gdb.py: libglib-gdb.py.in
sed -e "s|\@datadir\@|$(datadir)|" libglib-gdb.py.in > libglib-gdb.py sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
install-data-hook: libglib-gdb.py install-data-hook: libglib-gdb.py
......
...@@ -255,19 +255,23 @@ dist-hook: $(BUILT_EXTRA_DIST) ...@@ -255,19 +255,23 @@ dist-hook: $(BUILT_EXTRA_DIST)
install-data-local: install-ms-lib install-def-file install-data-local: install-ms-lib install-def-file
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb
distclean-local: distclean-local:
if test $(srcdir) = .; then :; else \ if test $(srcdir) = .; then :; else \
rm -f $(BUILT_EXTRA_DIST); \ rm -f $(BUILT_EXTRA_DIST); \
rm -f libgobject-gdb.py; \
fi fi
# install gdb scripts # install gdb scripts
gdbdir = $(datadir)/glib-2.0/gdb gdbdir = $(datadir)/glib-2.0/gdb
gdb_SCRIPTS = gobject.py dist_gdb_SCRIPTS = gobject.py
libgobject-gdb.py: libgobject-gdb.py.in libgobject-gdb.py: libgobject-gdb.py.in
sed -e "s|\@datadir\@|$(datadir)|" libgobject-gdb.py.in > libgobject-gdb.py sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libgobject-gdb.py.in > libgobject-gdb.py
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb
install-data-hook: libgobject-gdb.py install-data-hook: libgobject-gdb.py
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir} mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: glib VERSION\n" "Project-Id-Version: glib VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-04 20:42-0400\n" "POT-Creation-Date: 2009-09-22 12:51-0400\n"
"PO-Revision-Date: 2003-01-16 08:39+EDT\n" "PO-Revision-Date: 2003-01-16 08:39+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n" "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
"Language-Team: Amharic <locales@geez.org>\n" "Language-Team: Amharic <locales@geez.org>\n"
...@@ -242,34 +242,34 @@ msgstr "" ...@@ -242,34 +242,34 @@ msgstr ""
msgid "Template '%s' doesn't contain XXXXXX" msgid "Template '%s' doesn't contain XXXXXX"
msgstr "" msgstr ""
#: glib/gfileutils.c:1765 #: glib/gfileutils.c:1764
#, c-format #, c-format
msgid "%u byte" msgid "%u byte"
msgid_plural "%u bytes" msgid_plural "%u bytes"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: glib/gfileutils.c:1773 #: glib/gfileutils.c:1772
#, c-format #, c-format
msgid "%.1f KB" msgid "%.1f KB"
msgstr "" msgstr ""
#: glib/gfileutils.c:1778 #: glib/gfileutils.c:1777
#, c-format #, c-format
msgid "%.1f MB" msgid "%.1f MB"
msgstr "" msgstr ""
#: glib/gfileutils.c:1783 #: glib/gfileutils.c:1782
#, c-format #, c-format
msgid "%.1f GB" msgid "%.1f GB"
msgstr "" msgstr ""
#: glib/gfileutils.c:1826 #: glib/gfileutils.c:1825
#, c-format #, c-format
msgid "Failed to read the symbolic link '%s': %s" msgid "Failed to read the symbolic link '%s': %s"
msgstr "" msgstr ""
#: glib/gfileutils.c:1847 #: glib/gfileutils.c:1846
msgid "Symbolic links not supported" msgid "Symbolic links not supported"
msgstr "" msgstr ""
...@@ -500,7 +500,7 @@ msgstr "" ...@@ -500,7 +500,7 @@ msgstr ""
msgid "the pattern contains items not supported for partial matching" msgid "the pattern contains items not supported for partial matching"
msgstr "" msgstr ""
#: glib/gregex.c:154 gio/glocalfile.c:2105 #: glib/gregex.c:154 gio/glocalfile.c:2102
msgid "internal error" msgid "internal error"
msgstr "" msgstr ""
...@@ -712,66 +712,66 @@ msgstr "" ...@@ -712,66 +712,66 @@ msgstr ""
msgid "previously-checked referenced subpattern not found" msgid "previously-checked referenced subpattern not found"
msgstr "" msgstr ""
#: glib/gregex.c:526 glib/gregex.c:1607 #: glib/gregex.c:522 glib/gregex.c:1603
#, c-format #, c-format
msgid "Error while matching regular expression %s: %s" msgid "Error while matching regular expression %s: %s"
msgstr "" msgstr ""
#: glib/gregex.c:1098 #: glib/gregex.c:1094
msgid "PCRE library is compiled without UTF8 support" msgid "PCRE library is compiled without UTF8 support"
msgstr "" msgstr ""
#: glib/gregex.c:1107 #: glib/gregex.c:1103
msgid "PCRE library is compiled without UTF8 properties support" msgid "PCRE library is compiled without UTF8 properties support"
msgstr "" msgstr ""
#: glib/gregex.c:1161 #: glib/gregex.c:1157
#, c-format #, c-format
msgid "Error while compiling regular expression %s at char %d: %s" msgid "Error while compiling regular expression %s at char %d: %s"
msgstr "" msgstr ""
#: glib/gregex.c:1197 #: glib/gregex.c:1193
#, c-format #, c-format
msgid "Error while optimizing regular expression %s: %s" msgid "Error while optimizing regular expression %s: %s"
msgstr "" msgstr ""
#: glib/gregex.c:2035 #: glib/gregex.c:2031
msgid "hexadecimal digit or '}' expected" msgid "hexadecimal digit or '}' expected"
msgstr "" msgstr ""
#: glib/gregex.c:2051 #: glib/gregex.c:2047
msgid "hexadecimal digit expected" msgid "hexadecimal digit expected"
msgstr "" msgstr ""
#: glib/gregex.c:2091 #: glib/gregex.c:2087
msgid "missing '<' in symbolic reference" msgid "missing '<' in symbolic reference"
msgstr "" msgstr ""
#: glib/gregex.c:2100 #: glib/gregex.c:2096
msgid "unfinished symbolic reference" msgid "unfinished symbolic reference"
msgstr "" msgstr ""
#: glib/gregex.c:2107 #: glib/gregex.c:2103
msgid "zero-length symbolic reference" msgid "zero-length symbolic reference"
msgstr "" msgstr ""
#: glib/gregex.c:2118 #: glib/gregex.c:2114
msgid "digit expected" msgid "digit expected"
msgstr "" msgstr ""
#: glib/gregex.c:2136 #: glib/gregex.c:2132
msgid "illegal symbolic reference" msgid "illegal symbolic reference"
msgstr "" msgstr ""
#: glib/gregex.c:2198 #: glib/gregex.c:2194
msgid "stray final '\\'" msgid "stray final '\\'"
msgstr "" msgstr ""
#: glib/gregex.c:2202 #: glib/gregex.c:2198
msgid "unknown escape sequence" msgid "unknown escape sequence"
msgstr "" msgstr ""
#: glib/gregex.c:2212 #: glib/gregex.c:2208
#, c-format #, c-format
msgid "Error while parsing replacement text \"%s\" at char %lu: %s" msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
msgstr "" msgstr ""
...@@ -982,114 +982,114 @@ msgstr "" ...@@ -982,114 +982,114 @@ msgstr ""
msgid "File is empty" msgid "File is empty"
msgstr "" msgstr ""
#: glib/gkeyfile.c:765 #: glib/gkeyfile.c:764
#, c-format #, c-format
msgid "" msgid ""
"Key file contains line '%s' which is not a key-value pair, group, or comment" "Key file contains line '%s' which is not a key-value pair, group, or comment"
msgstr "" msgstr ""
#: glib/gkeyfile.c:825 #: glib/gkeyfile.c:824
#, fuzzy, c-format #, fuzzy, c-format
msgid "Invalid group name: %s" msgid "Invalid group name: %s"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል" msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: glib/gkeyfile.c:847 #: glib/gkeyfile.c:846
msgid "Key file does not start with a group" msgid "Key file does not start with a group"
msgstr "" msgstr ""
#: glib/gkeyfile.c:873 #: glib/gkeyfile.c:872
#, fuzzy, c-format #, fuzzy, c-format
msgid "Invalid key name: %s" msgid "Invalid key name: %s"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል" msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: glib/gkeyfile.c:900 #: glib/gkeyfile.c:899
#, c-format #, c-format
msgid "Key file contains unsupported encoding '%s'" msgid "Key file contains unsupported encoding '%s'"
msgstr "" msgstr ""
#: glib/gkeyfile.c:1116 glib/gkeyfile.c:1278 glib/gkeyfile.c:2507 #: glib/gkeyfile.c:1115 glib/gkeyfile.c:1277 glib/gkeyfile.c:2506
#: glib/gkeyfile.c:2573 glib/gkeyfile.c:2708 glib/gkeyfile.c:2841 #: glib/gkeyfile.c:2572 glib/gkeyfile.c:2707 glib/gkeyfile.c:2840
#: glib/gkeyfile.c:2994 glib/gkeyfile.c:3181 glib/gkeyfile.c:3242 #: glib/gkeyfile.c:2993 glib/gkeyfile.c:3180 glib/gkeyfile.c:3241
#, c-format #, c-format
msgid "Key file does not have group '%s'" msgid "Key file does not have group '%s'"
msgstr "" msgstr ""
#: glib/gkeyfile.c:1290 #: glib/gkeyfile.c:1289
#, c-format #, c-format
msgid "Key file does not have key '%s'" msgid "Key file does not have key '%s'"
msgstr "" msgstr ""
#: glib/gkeyfile.c:1397 glib/gkeyfile.c:1512 #: glib/gkeyfile.c:1396 glib/gkeyfile.c:1511
#, c-format #, c-format
msgid "Key file contains key '%s' with value '%s' which is not UTF-8" msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
msgstr "" msgstr ""
#: glib/gkeyfile.c:1417 glib/gkeyfile.c:1911 #: glib/gkeyfile.c:1416 glib/gkeyfile.c:1910
#, c-format #, c-format
msgid "Key file contains key '%s' which has value that cannot be interpreted." msgid "Key file contains key '%s' which has value that cannot be interpreted."
msgstr "" msgstr ""
#: glib/gkeyfile.c:1532 #: glib/gkeyfile.c:1531
#, c-format #, c-format
msgid "" msgid ""
"Key file contains key '%s' which has a value that cannot be interpreted." "Key file contains key '%s' which has a value that cannot be interpreted."
msgstr "" msgstr ""
#: glib/gkeyfile.c:2126 glib/gkeyfile.c:2338 #: glib/gkeyfile.c:2125 glib/gkeyfile.c:2337
#, c-format #, c-format
msgid "" msgid ""
"Key file contains key '%s' in group '%s' which has value that cannot be " "Key file contains key '%s' in group '%s' which has value that cannot be "
"interpreted." "interpreted."
msgstr "" msgstr ""
#: glib/gkeyfile.c:2522 glib/gkeyfile.c:2723 glib/gkeyfile.c:3253