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

2.22.0

parent 9203da30
......@@ -34,7 +34,7 @@ Notes about GLib 2.22
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
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
......
......@@ -900,73 +900,6 @@ Turns the argument into a string literal by using the '#' stringizing operator.
</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 ##### -->
<para>
......
......@@ -403,7 +403,7 @@ Since: 2.14
<!-- ##### MACRO G_LIKELY ##### -->
<!-- ##### FUNCTION G_LIKELY ##### -->
<para>
Hints the compiler that the expression is likely to evaluate to a true
value. The compiler may use this information for optimizations.
......@@ -413,9 +413,10 @@ if (G_LIKELY (random () != 1))
g_print ("not one");
</programlisting></informalexample>
@expr: the expression
@Returns: the value of @expr
@Since: 2.2
<!-- # Unused Parameters # -->
@expr: the expression
<!-- ##### 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
@Returns:
<!-- ##### MACRO G_POLLFD_FORMAT ##### -->
<para>
</para>
<!-- ##### STRUCT GSource ##### -->
<para>
The <structname>GSource</structname> struct is an opaque data type representing
......
......@@ -203,6 +203,27 @@ Returns %TRUE if tests are run in quiet mode.
@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 ##### -->
<para>
......
......@@ -19,6 +19,74 @@ typically use the features described here.
<!-- ##### 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 ##### -->
<para>
The major version number of the GLib library.
......
......@@ -366,12 +366,17 @@ dist-hook: $(BUILT_EXTRA_DIST)
if test -f $$f; then d=.; else d=$(srcdir); fi; \
cp $$d/$$f $(distdir) || exit 1; done
distclean-local:
if test $(srcdir) = .; then :; else \
rm -f libglib-gdb.py; \
fi
# install gdb scripts
gdbdir = $(datadir)/glib-2.0/gdb
gdb_SCRIPTS = glib.py
dist_gdb_SCRIPTS = glib.py
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
......
......@@ -255,19 +255,23 @@ dist-hook: $(BUILT_EXTRA_DIST)
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:
if test $(srcdir) = .; then :; else \
rm -f $(BUILT_EXTRA_DIST); \
rm -f libgobject-gdb.py; \
fi
# install gdb scripts
gdbdir = $(datadir)/glib-2.0/gdb
gdb_SCRIPTS = gobject.py
dist_gdb_SCRIPTS = gobject.py
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
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load${libdir}
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: glib VERSION\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"
"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
"Language-Team: Amharic <locales@geez.org>\n"
......@@ -242,34 +242,34 @@ msgstr ""
msgid "Template '%s' doesn't contain XXXXXX"
msgstr ""
#: glib/gfileutils.c:1765
#: glib/gfileutils.c:1764
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] ""
msgstr[1] ""
#: glib/gfileutils.c:1773
#: glib/gfileutils.c:1772
#, c-format
msgid "%.1f KB"
msgstr ""
#: glib/gfileutils.c:1778
#: glib/gfileutils.c:1777
#, c-format
msgid "%.1f MB"
msgstr ""
#: glib/gfileutils.c:1783
#: glib/gfileutils.c:1782
#, c-format
msgid "%.1f GB"
msgstr ""
#: glib/gfileutils.c:1826
#: glib/gfileutils.c:1825
#, c-format
msgid "Failed to read the symbolic link '%s': %s"
msgstr ""
#: glib/gfileutils.c:1847
#: glib/gfileutils.c:1846
msgid "Symbolic links not supported"
msgstr ""
......@@ -500,7 +500,7 @@ msgstr ""
msgid "the pattern contains items not supported for partial matching"
msgstr ""
#: glib/gregex.c:154 gio/glocalfile.c:2105
#: glib/gregex.c:154 gio/glocalfile.c:2102
msgid "internal error"
msgstr ""
......@@ -712,66 +712,66 @@ msgstr ""
msgid "previously-checked referenced subpattern not found"
msgstr ""
#: glib/gregex.c:526 glib/gregex.c:1607
#: glib/gregex.c:522 glib/gregex.c:1603
#, c-format
msgid "Error while matching regular expression %s: %s"
msgstr ""
#: glib/gregex.c:1098
#: glib/gregex.c:1094
msgid "PCRE library is compiled without UTF8 support"
msgstr ""
#: glib/gregex.c:1107
#: glib/gregex.c:1103
msgid "PCRE library is compiled without UTF8 properties support"
msgstr ""
#: glib/gregex.c:1161
#: glib/gregex.c:1157
#, c-format
msgid "Error while compiling regular expression %s at char %d: %s"
msgstr ""
#: glib/gregex.c:1197
#: glib/gregex.c:1193
#, c-format
msgid "Error while optimizing regular expression %s: %s"
msgstr ""
#: glib/gregex.c:2035
#: glib/gregex.c:2031
msgid "hexadecimal digit or '}' expected"
msgstr ""
#: glib/gregex.c:2051
#: glib/gregex.c:2047
msgid "hexadecimal digit expected"
msgstr ""
#: glib/gregex.c:2091
#: glib/gregex.c:2087
msgid "missing '<' in symbolic reference"
msgstr ""
#: glib/gregex.c:2100
#: glib/gregex.c:2096
msgid "unfinished symbolic reference"
msgstr ""
#: glib/gregex.c:2107
#: glib/gregex.c:2103
msgid "zero-length symbolic reference"
msgstr ""
#: glib/gregex.c:2118
#: glib/gregex.c:2114
msgid "digit expected"
msgstr ""
#: glib/gregex.c:2136
#: glib/gregex.c:2132
msgid "illegal symbolic reference"
msgstr ""
#: glib/gregex.c:2198
#: glib/gregex.c:2194
msgid "stray final '\\'"
msgstr ""
#: glib/gregex.c:2202
#: glib/gregex.c:2198
msgid "unknown escape sequence"
msgstr ""
#: glib/gregex.c:2212
#: glib/gregex.c:2208
#, c-format
msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
msgstr ""
......@@ -982,114 +982,114 @@ msgstr ""
msgid "File is empty"
msgstr ""
#: glib/gkeyfile.c:765
#: glib/gkeyfile.c:764
#, c-format
msgid ""
"Key file contains line '%s' which is not a key-value pair, group, or comment"
msgstr ""
#: glib/gkeyfile.c:825
#: glib/gkeyfile.c:824
#, fuzzy, c-format
msgid "Invalid group name: %s"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: glib/gkeyfile.c:847
#: glib/gkeyfile.c:846
msgid "Key file does not start with a group"
msgstr ""
#: glib/gkeyfile.c:873
#: glib/gkeyfile.c:872
#, fuzzy, c-format
msgid "Invalid key name: %s"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: glib/gkeyfile.c:900
#: glib/gkeyfile.c:899
#, c-format
msgid "Key file contains unsupported encoding '%s'"
msgstr ""
#: glib/gkeyfile.c:1116 glib/gkeyfile.c:1278 glib/gkeyfile.c:2507
#: glib/gkeyfile.c:2573 glib/gkeyfile.c:2708 glib/gkeyfile.c:2841
#: glib/gkeyfile.c:2994 glib/gkeyfile.c:3181 glib/gkeyfile.c:3242
#: glib/gkeyfile.c:1115 glib/gkeyfile.c:1277 glib/gkeyfile.c:2506
#: glib/gkeyfile.c:2572 glib/gkeyfile.c:2707 glib/gkeyfile.c:2840
#: glib/gkeyfile.c:2993 glib/gkeyfile.c:3180 glib/gkeyfile.c:3241
#, c-format
msgid "Key file does not have group '%s'"
msgstr ""
#: glib/gkeyfile.c:1290
#: glib/gkeyfile.c:1289
#, c-format
msgid "Key file does not have key '%s'"
msgstr ""
#: glib/gkeyfile.c:1397 glib/gkeyfile.c:1512
#: glib/gkeyfile.c:1396 glib/gkeyfile.c:1511
#, c-format
msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
msgstr ""
#: glib/gkeyfile.c:1417 glib/gkeyfile.c:1911
#: glib/gkeyfile.c:1416 glib/gkeyfile.c:1910
#, c-format
msgid "Key file contains key '%s' which has value that cannot be interpreted."
msgstr ""
#: glib/gkeyfile.c:1532
#: glib/gkeyfile.c:1531
#, c-format
msgid ""
"Key file contains key '%s' which has a value that cannot be interpreted."
msgstr ""
#: glib/gkeyfile.c:2126 glib/gkeyfile.c:2338
#: glib/gkeyfile.c:2125 glib/gkeyfile.c:2337
#, c-format
msgid ""
"Key file contains key '%s' in group '%s' which has value that cannot be "
"interpreted."
msgstr ""
#: glib/gkeyfile.c:2522 glib/gkeyfile.c:2723 glib/gkeyfile.c:3253
#: glib/gkeyfile.c:2521 glib/gkeyfile.c:2722 glib/gkeyfile.c:3252
#, c-format
msgid "Key file does not have key '%s' in group '%s'"
msgstr ""
#: glib/gkeyfile.c:3487
#: glib/gkeyfile.c:3486
msgid "Key file contains escape character at end of line"
msgstr ""
#: glib/gkeyfile.c:3509
#: glib/gkeyfile.c:3508
#, c-format
msgid "Key file contains invalid escape sequence '%s'"
msgstr ""
#: glib/gkeyfile.c:3651
#: glib/gkeyfile.c:3650
#, c-format
msgid "Value '%s' cannot be interpreted as a number."
msgstr ""
#: glib/gkeyfile.c:3665
#: glib/gkeyfile.c:3664
#, c-format
msgid "Integer value '%s' out of range"
msgstr ""
#: glib/gkeyfile.c:3698
#: glib/gkeyfile.c:3697
#, c-format
msgid "Value '%s' cannot be interpreted as a float number."
msgstr ""
#: glib/gkeyfile.c:3722
#: glib/gkeyfile.c:3721
#, c-format
msgid "Value '%s' cannot be interpreted as a boolean."
msgstr ""
#: gio/gbufferedinputstream.c:417 gio/gbufferedinputstream.c:498
#: gio/ginputstream.c:190 gio/ginputstream.c:322 gio/ginputstream.c:563
#: gio/ginputstream.c:688 gio/goutputstream.c:201 gio/goutputstream.c:656
#: gio/gbufferedinputstream.c:415 gio/gbufferedinputstream.c:496
#: gio/ginputstream.c:186 gio/ginputstream.c:318 gio/ginputstream.c:557
#: gio/ginputstream.c:682 gio/goutputstream.c:197 gio/goutputstream.c:652
#, c-format
msgid "Too large count value passed to %s"
msgstr ""
#: gio/gbufferedinputstream.c:885 gio/ginputstream.c:898 gio/giostream.c:309
#: gio/goutputstream.c:1085
#: gio/gbufferedinputstream.c:883 gio/ginputstream.c:892 gio/giostream.c:305
#: gio/goutputstream.c:1081
msgid "Stream is already closed"
msgstr ""
#: gio/gcancellable.c:420 gio/glocalfile.c:2098 gio/gsimpleasyncresult.c:650
#: gio/gsimpleasyncresult.c:676
#: gio/gcancellable.c:420 gio/glocalfile.c:2095 gio/gsimpleasyncresult.c:648
#: gio/gsimpleasyncresult.c:674
msgid "Operation was cancelled"
msgstr ""
......@@ -1107,7 +1107,7 @@ msgstr ""
msgid "%s type"
msgstr ""
#: gio/gdatainputstream.c:313
#: gio/gdatainputstream.c:311
msgid "Unexpected early end-of-stream"
msgstr ""
......@@ -1209,12 +1209,12 @@ msgstr ""
#. Translators: This is an error message when trying to find
#. * the enclosing (user visible) mount of a file, but none
#. * exists.
#: gio/gfile.c:1347 gio/glocalfile.c:1065 gio/glocalfile.c:1076
#: gio/glocalfile.c:1089
#: gio/gfile.c:1347 gio/glocalfile.c:1066 gio/glocalfile.c:1077
#: gio/glocalfile.c:1090
msgid "Containing mount does not exist"
msgstr ""
#: gio/gfile.c:2399 gio/glocalfile.c:2250
#: gio/gfile.c:2399 gio/glocalfile.c:2247
msgid "Can't copy over directory"
msgstr ""
......@@ -1222,7 +1222,7 @@ msgstr ""
msgid "Can't copy directory over directory"
msgstr ""
#: gio/gfile.c:2467 gio/glocalfile.c:2259
#: gio/gfile.c:2467 gio/glocalfile.c:2256
msgid "Target file exists"
msgstr ""
......@@ -1330,7 +1330,7 @@ msgstr ""
msgid "Can't handle the supplied version the icon encoding"
msgstr ""
#: gio/ginputstream.c:199
#: gio/ginputstream.c:195
msgid "Input stream doesn't implement read"
msgstr ""
......@@ -1340,7 +1340,7 @@ msgstr ""
#. Translators: This is an error you get if there is
#. * already an operation running against this stream when
#. * you try to start one
#: gio/ginputstream.c:908 gio/giostream.c:319 gio/goutputstream.c:1095
#: gio/ginputstream.c:902 gio/giostream.c:315 gio/goutputstream.c:1091
msgid "Stream has outstanding operation"
msgstr ""
......@@ -1362,106 +1362,106 @@ msgstr ""
msgid "Invalid filename %s"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: gio/glocalfile.c:973
#: gio/glocalfile.c:974
#, fuzzy, c-format
msgid "Error getting filesystem info: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
#: gio/glocalfile.c:1109
#: gio/glocalfile.c:1110
msgid "Can't rename root directory"
msgstr ""
#: gio/glocalfile.c:1129 gio/glocalfile.c:1155
#: gio/glocalfile.c:1130 gio/glocalfile.c:1156
#, fuzzy, c-format
msgid "Error renaming file: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
#: gio/glocalfile.c:1138
#: gio/glocalfile.c:1139
msgid "Can't rename file, filename already exist"
msgstr ""
#: gio/glocalfile.c:1151 gio/glocalfile.c:2127 gio/glocalfile.c:2156
#: gio/glocalfile.c:2312 gio/glocalfileoutputstream.c:550
#: gio/glocalfile.c:1152 gio/glocalfile.c:2124 gio/glocalfile.c:2153
#: gio/glocalfile.c:2309 gio/glocalfileoutputstream.c:550
#: gio/glocalfileoutputstream.c:603 gio/glocalfileoutputstream.c:648
#: gio/glocalfileoutputstream.c:1130
#, fuzzy
msgid "Invalid filename"
msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
#: gio/glocalfile.c:1307
#: gio/glocalfile.c:1308
#, fuzzy, c-format
msgid "Error opening file: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
#: gio/glocalfile.c:1317
#: gio/glocalfile.c:1318
msgid "Can't open directory"
msgstr ""
#: gio/glocalfile.c:1442
#: gio/glocalfile.c:1443