diff options
1035 files changed, 11693 insertions, 4927 deletions
@@ -1,112 +1,125 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -133,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -255,7 +268,7 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - 6. As an exception to the Sections above, you may also compile or + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -282,23 +295,31 @@ of these things: Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Accompany the work with a written offer, valid for at + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - c) If distribution of the work is made by offering access to copy + d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - d) Verify that the user has already received a copy of these + e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -347,7 +368,7 @@ Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent @@ -390,7 +411,7 @@ excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. +versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -411,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries @@ -453,19 +474,18 @@ convey the exclusion of warranty; and each file should have at least the Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. @@ -1,3 +1,1824 @@ +commit bb50b70713dbe8b41c8a729ecb90829e451ae335 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Mon Jun 19 21:51:09 2017 -0400 + + 2.53.3 + + NEWS | 33 +++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 34 insertions(+), 1 deletion(-) + +commit 5cb0ca7a352e599705a1dce151cb9e45655be1d3 +Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com> +Date: Sat Jun 17 11:01:18 2017 +0000 + + Update Kazakh translation + + po/kk.po | 1482 + ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 755 insertions(+), 727 deletions(-) + +commit 017f78d77f0bf2bed749e21199ea89d75e56ab69 +Author: Colin Walters <walters@verbum.org> +Date: Fri May 19 15:54:39 2017 -0400 + + gtype: Add private DEFINE_TYPE with prelude to workaround gtype + deadlocks + + And use it in GSocket, as it had a real-world case reported. + + https://bugzilla.gnome.org/show_bug.cgi?id=674885 + + gio/gsocket.c | 24 +++++++++++++++++------- + gobject/gtype-private.h | 11 +++++++++++ + gobject/gtype.h | 16 ++++++++++++++-- + 3 files changed, 42 insertions(+), 9 deletions(-) + +commit ac0b0c84f7d310012d6960d96bb5daa62b8d2d48 +Author: Philip Withnall <withnall@endlessm.com> +Date: Wed Jun 14 09:56:13 2017 +0100 + + gmessages: Expand documentation on GLogWriterFunc chaining + + As prompted by Marc-Andre Lureau. + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=661926 + + glib/gmessages.c | 5 ++++- + glib/gmessages.h | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit ad49479265d061eb73682648feb550b105c3898c +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Wed Jun 14 11:48:27 2017 +0800 + + Visual Studio builds: Visual Studio 2013 and later has va_copy() + + Update config.h.win32.in and glib/glibconfig.h.win32.in to indicate + so. + + config.h.win32.in | 4 ++-- + glib/glibconfig.h.win32.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 951fd642dc49bbbc49f4929cfe47b643b161c992 +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Wed Jun 14 10:51:55 2017 +0800 + + Visual Studio builds: Use the Centricular fork of libffi + + The latest upstream libffi is getting bit-rotten with the Windows/MSVC + builds, and since we are eventually moving to a Meson-based build + system, + make use of the Centricular fork of libffi[1], which is better + maintained + and tested for builds on Windows, with the use of DLLs over static + libraries + and elimination of awkward build flags that we had to use for GObject. + + [1]: https://github.com/centricular/libffi + + win32/vs10/README.txt | 10 +++++----- + win32/vs10/glib-build-defines.props | 2 +- + win32/vs10/gobject.vcxprojin | 8 ++++---- + win32/vs9/README.txt | 9 ++++----- + win32/vs9/glib-build-defines.vsprops | 2 +- + win32/vs9/gobject.vcprojin | 8 ++++---- + 6 files changed, 19 insertions(+), 20 deletions(-) + +commit d52f789a29be6686c469f98877b1d5b301ec2737 +Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com> +Date: Sun Jun 11 02:08:58 2017 +0200 + + Updated Esperanto translation + + po/eo.po | 4805 + ++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 3234 insertions(+), 1571 deletions(-) + +commit 45d4b59e3f7ef7b41db08f0c11ee5000126cfedb +Author: Ting-Wei Lan <lantw@src.gnome.org> +Date: Sun Dec 4 15:02:54 2016 +0800 + + glocalfileoutputstream: Fix symlink writing on FreeBSD and NetBSD + + FreeBSD, DragonflyBSD and NetBSD support O_NOFOLLOW, but they + use error + numbers that are different from what POSIX standard specifies. They + are + not going to change the behavior, and existing programs on these + systems + already take advantage of this difference. To support them, we have to + add a check in GIO to use different error numbers on these systems. + + https://bugzilla.gnome.org/show_bug.cgi?id=775593 + + gio/glocalfileoutputstream.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9c254f472fd49fbe57a99f5926b1621e5a254e54 +Author: Mario Blättermann <mario.blaettermann@gmail.com> +Date: Fri Jun 9 19:35:20 2017 +0000 + + Update German translation + + po/de.po | 71 + ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 36 insertions(+), 35 deletions(-) + +commit 34045e66a69636933b3e2c5c84ecab4463ff58d4 +Author: Simon McVittie <smcv@collabora.com> +Date: Fri Jun 9 12:41:54 2017 +0100 + + GGtkNotificationBackend: Use correct path for GetNameOwner call + + For historical reasons, the reference dbus-daemon responds to most + method calls on all object paths. However, the canonical path + of the object implementing the o.fd.DBus interface is + /org/freedesktop/DBus, and in some environments (notably AppArmor + with the <abstractions/dbus-session-strict> abstraction) only this + path is allowed. + + https://bugs.freedesktop.org/show_bug.cgi?id=101256 officially + deprecates all other object paths, and when adding new APIs we will + only make them available on the canonical object path. + + Signed-off-by: Simon McVittie <smcv@collabora.com> + Reviewed-by: Emmanuele Bassi <ebassi@gnome.org> + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=783593 + + gio/ggtknotificationbackend.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit debbdb7ce7818beb9d73aafa6b261db4d7c9aa4f +Author: Debarshi Ray <debarshir@gnome.org> +Date: Wed Jun 7 20:57:24 2017 +0200 + + docs: The program name is also set by g_application_run + + https://bugzilla.gnome.org/show_bug.cgi?id=783524 + + glib/gutils.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 6863080c32abff9667238a3b04750c6f675e1e1a +Author: Ondrej Holy <oholy@redhat.com> +Date: Tue Jun 6 10:04:56 2017 +0200 + + gio-tool: Fix alignment of monitor messages + + Name of GMount/GVolume/GDrive is aligned in many cases in output + messages, + except few cases. Let's unify the alignment. + + https://bugzilla.gnome.org/show_bug.cgi?id=776169 + + gio/gio-tool-mount.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 085b3470f0bc1c2972a63433caa4e098a378d2f6 +Author: Philip Withnall <withnall@endlessm.com> +Date: Mon Jun 5 16:07:52 2017 +0100 + + gdbusintrospection: Remove incorrect (out) annotations + + The caller passes in a GString instance which is then modified by the + function, rather than the function building its own GString and + passing + it out to the caller. + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=783392 + + gio/gdbusintrospection.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f98d9982677117834625f72ac1e496774564e15d +Author: Philip Withnall <withnall@endlessm.com> +Date: Mon Jun 5 16:04:18 2017 +0100 + + gdatainputstream: Annotate (out) length arguments as (optional) + + All of them are. + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=783350 + + gio/gdatainputstream.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit cb9de6695c2716c88d830e6641ea9749e197b3b5 +Author: Daniel Mustieles <daniel.mustieles@gmail.com> +Date: Mon Jun 5 14:12:15 2017 +0000 + + Update Spanish translation + + po/es.po | 316 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 161 insertions(+), 155 deletions(-) + +commit 329b7bdec5bd95ea4100f86e05e7fe446524fe26 +Author: Kukuh Syafaat <syafaatkukuh@gmail.com> +Date: Sat Jun 3 23:44:14 2017 +0000 + + Update Indonesian translation + + po/id.po | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit eea06815749498edc07e35bbbd71c2fb57e4267d +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Fri Jun 2 12:46:13 2017 +0200 + + LGPLv2+ -> LGPLv2.1+: update remaining files + + For the files in gio/ (but not in gio/ sub-directories), only + the *.[ch] + files were handled in commit 3bf4a720c315b5015c8d51edf0b458348f796674. + + For the modified files in glib/tests/markups/, I've tested that + `make check` still succeeds. + + After this commit, + $ git grep -in "GNU Library" + and + $ git grep -in "Library General" + return only results in COPYING files and in glib/libcharset/. The + latter + was not updated because it's a copy. + + $ git grep -in "version 2" | grep -iv "version 2\.1" + now doesn't return any LGPL license header. + - glib-gettextize.in: GPL + - glib/gen-unicode-tables.pl: GPL + - glib/gnulib/: a copy + - glib/libcharset/: a copy + - m4macros/attributes.m4: GPL + - po/po2tbl.sed.in: GPL + - tap-driver.sh: GPL + - tests/*.pl: GPL + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/data-to-c.pl | 2 +- + gio/gnetworking.h.in | 6 +++--- + gio/gnetworking.h.win32 | 6 +++--- + gio/gopenuriportal.c | 6 +++--- + gio/gopenuriportal.h | 6 +++--- + gio/org.freedesktop.portal.Documents.xml | 2 +- + gio/org.freedesktop.portal.NetworkMonitor.xml | 2 +- + gio/org.freedesktop.portal.OpenURI.xml | 2 +- + gio/org.freedesktop.portal.ProxyResolver.xml | 2 +- + glib/tests/markups/valid-14.expected | 2 +- + glib/tests/markups/valid-14.gmarkup | 2 +- + 11 files changed, 19 insertions(+), 19 deletions(-) + +commit 34b21312f1e0f6d35ccc815cc93f723c0a225ff3 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Fri Jun 2 11:42:42 2017 -0700 + + appinfo: Fix the build on windows + + The previous commit forgot to protect some unix-only + calls by an ifdef. + + Pointed out by John Emmas. + + gio/gappinfo.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7c5cd293d02d8650973c397b515b5d4a88ba0f80 +Author: Patrick Griffis <tingping@tingping.se> +Date: Tue Dec 20 00:41:36 2016 -0500 + + Fix g_file_copy_async() annotation + + https://bugzilla.gnome.org/show_bug.cgi?id=776333 + + gio/gfile.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e4e83bff7282348387c7fe3fae5dad80aebaf096 +Author: Ignacio Casal Quinteiro <qignacio@amazon.com> +Date: Thu Jun 1 09:11:00 2017 +0200 + + win32: port monotonic times to use QPC + + This provides a high precision monotonic time and + the concerns that we had are no longer true + on new versions of Windows (7+). + + https://bugzilla.gnome.org/show_bug.cgi?id=783340 + + glib/gmain.c | 134 + +++++++++++------------------------------------------------ + 1 file changed, 24 insertions(+), 110 deletions(-) + +commit b4ee4628d9133556fae8144d8e5454346d23cabc +Author: РуÑлан Ижбулатов <lrn1986@gmail.com> +Date: Fri Apr 14 07:29:05 2017 +0000 + + GetTickCount64 is a __stdcall function + + https://bugzilla.gnome.org/show_bug.cgi?id=781301 + + glib/gmain.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1d60fc846ce208ca730919e3608bd8ffda31a0c +Author: John Lindgren <john@jlindgren.net> +Date: Fri Apr 14 02:09:35 2017 -0400 + + NtNotifyChangeMultipleKeys is a __stdcall function. + + https://bugzilla.gnome.org/show_bug.cgi?id=781301 + + gio/gwin32registrykey.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 4dd1b17c2487470831f03d7ee52e3cc1a0c9e0bd +Author: Philip Withnall <withnall@endlessm.com> +Date: Mon Feb 6 09:41:10 2017 +0100 + + gdbus: Fix race in name watching on connection teardown + + If g_dbus_unwatch_name() is called from one thread at the same time as + the GDBusConnection is emitting ::disconnected in another thread, + there + will be a race and the handler for ::disconnected may end up using + memory after it’s freed. + + Fix this by serialising through the map_id_to_client, so that + on_connection_disconnected() atomically gets a strong reference to the + Client, or NULL. + + https://bugzilla.gnome.org/show_bug.cgi?id=777307 + + gio/gdbusnamewatching.c | 48 + +++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 43 insertions(+), 5 deletions(-) + +commit 97068f363efd40893ff902201390b0efe92d3293 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Wed May 31 12:10:25 2017 -0400 + + OpenFile support: Handle open failing + + This can happen, report it as an error when it does. + + gio/gopenuriportal.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit e1e73dafa6eeae3e045bf054e132c2c70ff2bcc0 +Author: Philip Withnall <withnall@endlessm.com> +Date: Thu Mar 30 11:02:14 2017 +0100 + + gsubprocess: Copy parent process’ environ when clearing + subprocess’ + + Previously, this was done at the time of spawning the subprocess, + which + meant the g_subprocess_launcher_*_environ() functions could not + be used + to modify the parent process’ environment. + + Change the code to copy the parent process’ environment when + g_subprocess_launcher_set_environ(NULL) is called. Document the change + and add a unit test. + + https://bugzilla.gnome.org/show_bug.cgi?id=778422 + + gio/gsubprocesslauncher.c | 11 +++++++++-- + gio/tests/gsubprocess.c | 46 + ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 2 deletions(-) + +commit c7d325733c6a3bd384df6523350d9312df5ccc92 +Author: Philip Withnall <withnall@endlessm.com> +Date: Wed May 31 11:08:55 2017 +0100 + + docs: Mention GtkApplication in the GResource documentation + + Since GtkApplication auto-loads some well-known resource paths. Add a + cross-reference to its documentation. (The cross-reference won’t be + linked if the GTK+ documentation isn’t available at build time, + but this + is probably good enough. It is likely to be available.) + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=782336 + + gio/gresource.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 678899e87a77b534535af58d87872d642aef6a5c +Author: Philip Withnall <withnall@endlessm.com> +Date: Wed May 31 11:08:05 2017 +0100 + + docs: Mention the alias GResource attribute in the documentation + + It was the only part of the XML format which was not documented. + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=782336 + + gio/gresource.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 29b4e9b05f534c98ef7e5aa346b1ec9dca781cbf +Author: Philip Withnall <withnall@endlessm.com> +Date: Wed May 31 10:55:25 2017 +0100 + + docs: Improve formatting and fix typos in GResource documentation + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + gio/gresource.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit 4c8ab22b95de887af7e233095816c3ae9dd8c10e +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sat May 20 16:21:14 2017 -0400 + + Use OpenFile for local files + + The OpenURI portal has a separate method to handle local + files now. Use it. + + At the same time, split out the openuri helpers into separate + files, and generate code for the OpenURI portal. + + https://bugzilla.gnome.org/show_bug.cgi?id=783193 + + gio/Makefile.am | 4 + + gio/gappinfo.c | 264 +++------------------------- + gio/gopenuriportal.c | 302 + +++++++++++++++++++++++++++++++++ + gio/gopenuriportal.h | 41 +++++ + gio/org.freedesktop.portal.OpenURI.xml | 105 ++++++++++++ + 5 files changed, 471 insertions(+), 245 deletions(-) + +commit 99d34f65d3101333ffad69f06e4625000585c7bf +Author: Florian Müllner <fmuellner@gnome.org> +Date: Mon May 29 00:38:19 2017 +0200 + + gdbus-codegen: Apply --output-directory to generated docs as well + + In addition to code, gdbus-codegen can also generate docbook + documentation for DBus interfaces. There's no good reason why + the newly added --output-directory option shouldn't apply to + those generated files as well. + + https://bugzilla.gnome.org/show_bug.cgi?id=783201 + + gio/gdbus-2.0/codegen/codegen_docbook.py | 6 ++++-- + gio/gdbus-2.0/codegen/codegen_main.py | 5 +++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit d3b4f7c9f6be6894538fa7b172aad43b9031e983 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sat May 6 14:22:38 2017 -0400 + + Make dbus activation sandbox-aware + + When we call org.freedesktop.Application.Open to activate + an application and pass file uris, the application may not + be able to see the files due to a flatpak sandbox. + + Flatpak puts the flatpak app-id in the X-Flatpak key in + desktop files that it exports, so we can easily recognize + applications that may be affected by this. + + In this case, call the document portal to export the files + and pass the resulting uri's instead of the original ones. + + https://bugzilla.gnome.org/show_bug.cgi?id=783130 + + gio/gdesktopappinfo.c | 43 ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 36 insertions(+), 7 deletions(-) + +commit 60a1cc9facaa29414213066fddf8507575f6ff3f +Author: Matthias Clasen <mclasen@redhat.com> +Date: Tue May 23 22:08:01 2017 -0400 + + Add a wrapper for the AddFull document portal api + + This is a wrapper which takes a list of uris and rewrites + them by calling AddFull with the file:// uris. + + https://bugzilla.gnome.org/show_bug.cgi?id=783130 + + gio/gdocumentportal.c | 126 + +++++++++++++++++++++++++++++++++++++++++++++++++- + gio/gdocumentportal.h | 4 ++ + 2 files changed, 129 insertions(+), 1 deletion(-) + +commit a76fc7fa760c21776d4c2888d3064597cf18ca78 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Tue May 23 21:54:39 2017 -0400 + + Update flatpak document portal interface + + This api has been changed upstream, recently. + + A new AddFull method has been added in this commit: + https://github.com/flatpak/flatpak/commit/6ce8521b640c7a69f97a2fd7c96de94eb9a83125 + + https://bugzilla.gnome.org/show_bug.cgi?id=783130 + + gio/Makefile.am | 1 + + gio/org.freedesktop.portal.Documents.xml | 161 + ++++++++++++++++++++++++++++++- + 2 files changed, 160 insertions(+), 2 deletions(-) + +commit 90b255ee93684515914f2ebd3fd2c6f822225883 +Author: Philip Withnall <withnall@endlessm.com> +Date: Mon May 29 22:53:44 2017 +0100 + + docs: Fix minor cross-linking problem in GVariant documentation + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + glib/gvariant.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cc8b3d6ee203c58a6465c464d71838dd587241eb +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Fri May 26 15:15:21 2017 +0200 + + docs: LGPL: Library -> Lesser + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + docs/reference/glib/glib-docs.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2d51054ab60a5ee3aa39595cdcf3eb90bd55d458 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Sun May 28 14:05:16 2017 +0200 + + Update COPYING file to LGPLv2.1 + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + COPYING | 216 + +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 118 insertions(+), 98 deletions(-) + +commit f6c44ec3e44557463721a54b7b6fe0264c6d2424 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Sun May 28 14:09:39 2017 +0200 + + tests/: LGPLv2+ -> LGPLv2.1+ + + gen-casefold-txt.pl and gen-casemap-txt.pl are licensed under + GPLv2+, so + they are not touched by this commit. + + A lot of *.c files in tests/ don't have a license header. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + tests/child-test.c | 2 +- + tests/completion-test.c | 2 +- + tests/dirname-test.c | 2 +- + tests/env-test.c | 2 +- + tests/file-test.c | 2 +- + tests/gio-test.c | 2 +- + tests/gobject/accumulator.c | 2 +- + tests/gobject/defaultiface.c | 2 +- + tests/gobject/deftype.c | 2 +- + tests/gobject/dynamictype.c | 2 +- + tests/gobject/gvalue-test.c | 2 +- + tests/gobject/ifacecheck.c | 2 +- + tests/gobject/ifaceinherit.c | 2 +- + tests/gobject/ifaceinit.c | 2 +- + tests/gobject/override.c | 2 +- + tests/gobject/paramspec-test.c | 2 +- + tests/gobject/performance-threaded.c | 2 +- + tests/gobject/performance.c | 2 +- + tests/gobject/references.c | 2 +- + tests/gobject/signals.c | 2 +- + tests/gobject/singleton.c | 2 +- + tests/gobject/testcommon.h | 2 +- + tests/gobject/testgobject.c | 2 +- + tests/gobject/testmodule.c | 2 +- + tests/gobject/testmodule.h | 2 +- + tests/libmoduletestplugin_a.c | 2 +- + tests/libmoduletestplugin_b.c | 2 +- + tests/mapping-test.c | 2 +- + tests/memchunks.c | 2 +- + tests/module-test.c | 2 +- + tests/relation-test.c | 2 +- + tests/slice-color.c | 2 +- + tests/slice-concurrent.c | 2 +- + tests/slice-test.c | 2 +- + tests/sources.c | 2 +- + tests/spawn-test.c | 2 +- + tests/testglib.c | 2 +- + tests/type-test.c | 2 +- + 38 files changed, 38 insertions(+), 38 deletions(-) + +commit 3bf4a720c315b5015c8d51edf0b458348f796674 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Sat May 27 18:21:30 2017 +0200 + + gio/: LGPLv2+ -> LGPLv2.1+ + + Sub-directories inside gio/ already processed in a previous commit: + - fam/ + - gdbus-2.0/ (which contains only codegen/) + - gvdb/ + - inotify/ + - tests/ + - win32/ + - xdgmime/ + + Other sub-directories inside gio/: + - completion/: no license headers + - kqueue/: not LGPL, BSD-style license + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/gaction.c | 8 ++++---- + gio/gaction.h | 8 ++++---- + gio/gactiongroup.c | 8 ++++---- + gio/gactiongroup.h | 8 ++++---- + gio/gactiongroupexporter.c | 8 ++++---- + gio/gactiongroupexporter.h | 8 ++++---- + gio/gactionmap.c | 8 ++++---- + gio/gactionmap.h | 8 ++++---- + gio/gappinfo.c | 2 +- + gio/gappinfo.h | 2 +- + gio/gappinfoprivate.h | 2 +- + gio/gapplication-tool.c | 2 +- + gio/gapplication.c | 8 ++++---- + gio/gapplication.h | 8 ++++---- + gio/gapplicationcommandline.c | 8 ++++---- + gio/gapplicationcommandline.h | 8 ++++---- + gio/gapplicationimpl-dbus.c | 2 +- + gio/gasynchelper.c | 2 +- + gio/gasynchelper.h | 2 +- + gio/gasyncinitable.c | 2 +- + gio/gasyncinitable.h | 2 +- + gio/gasyncresult.c | 2 +- + gio/gasyncresult.h | 2 +- + gio/gbufferedinputstream.c | 2 +- + gio/gbufferedinputstream.h | 2 +- + gio/gbufferedoutputstream.c | 2 +- + gio/gbufferedoutputstream.h | 2 +- + gio/gbytesicon.c | 2 +- + gio/gbytesicon.h | 2 +- + gio/gcancellable.c | 2 +- + gio/gcancellable.h | 2 +- + gio/gcharsetconverter.c | 2 +- + gio/gcharsetconverter.h | 2 +- + gio/gcocoanotificationbackend.c | 2 +- + gio/gcontenttype-win32.c | 2 +- + gio/gcontenttype.c | 2 +- + gio/gcontenttype.h | 2 +- + gio/gcontenttypeprivate.h | 2 +- + gio/gcontextspecificgroup.c | 2 +- + gio/gcontextspecificgroup.h | 2 +- + gio/gconverter.c | 2 +- + gio/gconverter.h | 2 +- + gio/gconverterinputstream.c | 2 +- + gio/gconverterinputstream.h | 2 +- + gio/gconverteroutputstream.c | 2 +- + gio/gconverteroutputstream.h | 2 +- + gio/gcredentials.c | 2 +- + gio/gcredentials.h | 2 +- + gio/gcredentialsprivate.h | 2 +- + gio/gdatagrambased.c | 2 +- + gio/gdatagrambased.h | 2 +- + gio/gdatainputstream.c | 2 +- + gio/gdatainputstream.h | 2 +- + gio/gdataoutputstream.c | 2 +- + gio/gdataoutputstream.h | 2 +- + gio/gdbus-tool.c | 2 +- + gio/gdbusactiongroup-private.h | 8 ++++---- + gio/gdbusactiongroup.c | 8 ++++---- + gio/gdbusactiongroup.h | 8 ++++---- + gio/gdbusaddress.c | 2 +- + gio/gdbusaddress.h | 2 +- + gio/gdbusauth.c | 2 +- + gio/gdbusauth.h | 2 +- + gio/gdbusauthmechanism.c | 2 +- + gio/gdbusauthmechanism.h | 2 +- + gio/gdbusauthmechanismanon.c | 2 +- + gio/gdbusauthmechanismanon.h | 2 +- + gio/gdbusauthmechanismexternal.c | 2 +- + gio/gdbusauthmechanismexternal.h | 2 +- + gio/gdbusauthmechanismsha1.c | 2 +- + gio/gdbusauthmechanismsha1.h | 2 +- + gio/gdbusauthobserver.c | 2 +- + gio/gdbusauthobserver.h | 2 +- + gio/gdbusconnection.c | 2 +- + gio/gdbusconnection.h | 2 +- + gio/gdbuserror.c | 2 +- + gio/gdbuserror.h | 2 +- + gio/gdbusinterface.c | 2 +- + gio/gdbusinterface.h | 2 +- + gio/gdbusinterfaceskeleton.c | 2 +- + gio/gdbusinterfaceskeleton.h | 2 +- + gio/gdbusintrospection.c | 2 +- + gio/gdbusintrospection.h | 2 +- + gio/gdbusmenumodel.c | 8 ++++---- + gio/gdbusmenumodel.h | 8 ++++---- + gio/gdbusmessage.c | 2 +- + gio/gdbusmessage.h | 2 +- + gio/gdbusmethodinvocation.c | 2 +- + gio/gdbusmethodinvocation.h | 2 +- + gio/gdbusnameowning.c | 2 +- + gio/gdbusnameowning.h | 2 +- + gio/gdbusnamewatching.c | 2 +- + gio/gdbusnamewatching.h | 2 +- + gio/gdbusobject.c | 2 +- + gio/gdbusobject.h | 2 +- + gio/gdbusobjectmanager.c | 2 +- + gio/gdbusobjectmanager.h | 2 +- + gio/gdbusobjectmanagerclient.c | 2 +- + gio/gdbusobjectmanagerclient.h | 2 +- + gio/gdbusobjectmanagerserver.c | 2 +- + gio/gdbusobjectmanagerserver.h | 2 +- + gio/gdbusobjectproxy.c | 2 +- + gio/gdbusobjectproxy.h | 2 +- + gio/gdbusobjectskeleton.c | 2 +- + gio/gdbusobjectskeleton.h | 2 +- + gio/gdbusprivate.c | 2 +- + gio/gdbusprivate.h | 2 +- + gio/gdbusproxy.c | 2 +- + gio/gdbusproxy.h | 2 +- + gio/gdbusserver.c | 2 +- + gio/gdbusserver.h | 2 +- + gio/gdbusutils.c | 2 +- + gio/gdbusutils.h | 2 +- + gio/gdelayedsettingsbackend.c | 2 +- + gio/gdelayedsettingsbackend.h | 2 +- + gio/gdesktopappinfo.c | 2 +- + gio/gdesktopappinfo.h | 2 +- + gio/gdocumentportal.c | 2 +- + gio/gdocumentportal.h | 2 +- + gio/gdrive.c | 2 +- + gio/gdrive.h | 2 +- + gio/gdtlsclientconnection.c | 2 +- + gio/gdtlsclientconnection.h | 2 +- + gio/gdtlsconnection.c | 2 +- + gio/gdtlsconnection.h | 2 +- + gio/gdtlsserverconnection.c | 2 +- + gio/gdtlsserverconnection.h | 2 +- + gio/gdummyfile.c | 2 +- + gio/gdummyfile.h | 2 +- + gio/gdummyproxyresolver.c | 2 +- + gio/gdummyproxyresolver.h | 2 +- + gio/gdummytlsbackend.c | 2 +- + gio/gdummytlsbackend.h | 2 +- + gio/gemblem.c | 2 +- + gio/gemblem.h | 2 +- + gio/gemblemedicon.c | 2 +- + gio/gemblemedicon.h | 2 +- + gio/gfdonotificationbackend.c | 2 +- + gio/gfile.c | 2 +- + gio/gfile.h | 2 +- + gio/gfileattribute-priv.h | 2 +- + gio/gfileattribute.c | 2 +- + gio/gfileattribute.h | 2 +- + gio/gfiledescriptorbased.c | 2 +- + gio/gfiledescriptorbased.h | 2 +- + gio/gfileenumerator.c | 2 +- + gio/gfileenumerator.h | 2 +- + gio/gfileicon.c | 2 +- + gio/gfileicon.h | 2 +- + gio/gfileinfo-priv.h | 2 +- + gio/gfileinfo.c | 2 +- + gio/gfileinfo.h | 2 +- + gio/gfileinputstream.c | 2 +- + gio/gfileinputstream.h | 2 +- + gio/gfileiostream.c | 2 +- + gio/gfileiostream.h | 2 +- + gio/gfilemonitor.c | 2 +- + gio/gfilemonitor.h | 2 +- + gio/gfilenamecompleter.c | 2 +- + gio/gfilenamecompleter.h | 2 +- + gio/gfileoutputstream.c | 2 +- + gio/gfileoutputstream.h | 2 +- + gio/gfilterinputstream.c | 2 +- + gio/gfilterinputstream.h | 2 +- + gio/gfilteroutputstream.c | 2 +- + gio/gfilteroutputstream.h | 2 +- + gio/ggtknotificationbackend.c | 2 +- + gio/ghttpproxy.c | 2 +- + gio/ghttpproxy.h | 2 +- + gio/gicon.c | 2 +- + gio/gicon.h | 2 +- + gio/ginetaddress.c | 2 +- + gio/ginetaddress.h | 2 +- + gio/ginetaddressmask.c | 2 +- + gio/ginetaddressmask.h | 2 +- + gio/ginetsocketaddress.c | 2 +- + gio/ginetsocketaddress.h | 2 +- + gio/ginitable.c | 2 +- + gio/ginitable.h | 2 +- + gio/ginputstream.c | 2 +- + gio/ginputstream.h | 2 +- + gio/gio-autocleanups.h | 2 +- + gio/gio-querymodules.c | 2 +- + gio/gio-tool-cat.c | 2 +- + gio/gio-tool-copy.c | 2 +- + gio/gio-tool-info.c | 2 +- + gio/gio-tool-list.c | 2 +- + gio/gio-tool-mime.c | 2 +- + gio/gio-tool-mkdir.c | 2 +- + gio/gio-tool-monitor.c | 2 +- + gio/gio-tool-mount.c | 2 +- + gio/gio-tool-move.c | 2 +- + gio/gio-tool-open.c | 2 +- + gio/gio-tool-remove.c | 2 +- + gio/gio-tool-rename.c | 2 +- + gio/gio-tool-save.c | 2 +- + gio/gio-tool-set.c | 2 +- + gio/gio-tool-trash.c | 2 +- + gio/gio-tool-tree.c | 2 +- + gio/gio-tool.c | 2 +- + gio/gio-tool.h | 2 +- + gio/gio.h | 2 +- + gio/gio_trace.h | 2 +- + gio/gioenums.h | 2 +- + gio/gioerror.c | 2 +- + gio/gioerror.h | 2 +- + gio/giomodule-priv.h | 2 +- + gio/giomodule.c | 2 +- + gio/giomodule.h | 2 +- + gio/gioprivate.h | 2 +- + gio/gioscheduler.c | 2 +- + gio/gioscheduler.h | 2 +- + gio/giostream.c | 2 +- + gio/giostream.h | 8 ++++---- + gio/giotypes.h | 2 +- + gio/giowin32-priv.h | 2 +- + gio/gkeyfilesettingsbackend.c | 2 +- + gio/glib-compile-resources.c | 2 +- + gio/glib-compile-schemas.c | 2 +- + gio/glistmodel.c | 2 +- + gio/glistmodel.h | 2 +- + gio/gliststore.c | 2 +- + gio/gliststore.h | 2 +- + gio/gloadableicon.c | 2 +- + gio/gloadableicon.h | 2 +- + gio/glocalfile.c | 2 +- + gio/glocalfile.h | 2 +- + gio/glocalfileenumerator.c | 2 +- + gio/glocalfileenumerator.h | 2 +- + gio/glocalfileinfo.c | 2 +- + gio/glocalfileinfo.h | 2 +- + gio/glocalfileinputstream.c | 2 +- + gio/glocalfileinputstream.h | 2 +- + gio/glocalfileiostream.c | 2 +- + gio/glocalfileiostream.h | 2 +- + gio/glocalfilemonitor.c | 2 +- + gio/glocalfilemonitor.h | 2 +- + gio/glocalfileoutputstream.c | 2 +- + gio/glocalfileoutputstream.h | 2 +- + gio/glocalfileprivate.h | 2 +- + gio/glocalvfs.c | 2 +- + gio/glocalvfs.h | 2 +- + gio/gmemoryinputstream.c | 2 +- + gio/gmemoryinputstream.h | 2 +- + gio/gmemoryoutputstream.c | 2 +- + gio/gmemoryoutputstream.h | 2 +- + gio/gmemorysettingsbackend.c | 2 +- + gio/gmenu.c | 8 ++++---- + gio/gmenu.h | 8 ++++---- + gio/gmenuexporter.c | 8 ++++---- + gio/gmenuexporter.h | 8 ++++---- + gio/gmenumodel.c | 8 ++++---- + gio/gmenumodel.h | 8 ++++---- + gio/gmount.c | 2 +- + gio/gmount.h | 2 +- + gio/gmountoperation.c | 2 +- + gio/gmountoperation.h | 2 +- + gio/gmountprivate.h | 2 +- + gio/gnativesocketaddress.c | 2 +- + gio/gnativesocketaddress.h | 2 +- + gio/gnativevolumemonitor.c | 2 +- + gio/gnativevolumemonitor.h | 2 +- + gio/gnetworkaddress.c | 2 +- + gio/gnetworkaddress.h | 2 +- + gio/gnetworking.c | 2 +- + gio/gnetworkingprivate.h | 2 +- + gio/gnetworkmonitor.c | 2 +- + gio/gnetworkmonitor.h | 2 +- + gio/gnetworkmonitorbase.c | 2 +- + gio/gnetworkmonitorbase.h | 2 +- + gio/gnetworkmonitornetlink.c | 2 +- + gio/gnetworkmonitornetlink.h | 2 +- + gio/gnetworkmonitornm.c | 2 +- + gio/gnetworkmonitornm.h | 2 +- + gio/gnetworkmonitorportal.c | 2 +- + gio/gnetworkmonitorportal.h | 2 +- + gio/gnetworkservice.c | 2 +- + gio/gnetworkservice.h | 2 +- + gio/gnextstepsettingsbackend.c | 2 +- + gio/gnotification-private.h | 2 +- + gio/gnotification.c | 2 +- + gio/gnotification.h | 2 +- + gio/gnotificationbackend.c | 8 ++++---- + gio/gnotificationbackend.h | 8 ++++---- + gio/gnullsettingsbackend.c | 2 +- + gio/gosxappinfo.c | 2 +- + gio/gosxappinfo.h | 2 +- + gio/gosxcontenttype.c | 2 +- + gio/goutputstream.c | 2 +- + gio/goutputstream.h | 2 +- + gio/gpermission.c | 2 +- + gio/gpermission.h | 2 +- + gio/gpollableinputstream.c | 2 +- + gio/gpollableinputstream.h | 2 +- + gio/gpollableoutputstream.c | 2 +- + gio/gpollableoutputstream.h | 2 +- + gio/gpollableutils.c | 2 +- + gio/gpollableutils.h | 2 +- + gio/gpollfilemonitor.c | 2 +- + gio/gpollfilemonitor.h | 2 +- + gio/gportalnotificationbackend.c | 2 +- + gio/gportalsupport.c | 2 +- + gio/gportalsupport.h | 2 +- + gio/gpropertyaction.c | 8 ++++---- + gio/gpropertyaction.h | 8 ++++---- + gio/gproxy.c | 2 +- + gio/gproxy.h | 2 +- + gio/gproxyaddress.c | 2 +- + gio/gproxyaddress.h | 2 +- + gio/gproxyaddressenumerator.c | 2 +- + gio/gproxyaddressenumerator.h | 2 +- + gio/gproxyresolver.c | 2 +- + gio/gproxyresolver.h | 2 +- + gio/gproxyresolverportal.c | 2 +- + gio/gproxyresolverportal.h | 2 +- + gio/gregistrysettingsbackend.c | 2 +- + gio/gregistrysettingsbackend.h | 2 +- + gio/gremoteactiongroup.c | 8 ++++---- + gio/gremoteactiongroup.h | 8 ++++---- + gio/gresolver.c | 2 +- + gio/gresolver.h | 2 +- + gio/gresource-tool.c | 2 +- + gio/gresource.c | 2 +- + gio/gresource.h | 2 +- + gio/gresourcefile.c | 2 +- + gio/gresourcefile.h | 2 +- + gio/gseekable.c | 2 +- + gio/gseekable.h | 2 +- + gio/gsettings-mapping.c | 2 +- + gio/gsettings-mapping.h | 2 +- + gio/gsettings-tool.c | 2 +- + gio/gsettings.c | 2 +- + gio/gsettings.h | 2 +- + gio/gsettingsbackend.c | 2 +- + gio/gsettingsbackend.h | 2 +- + gio/gsettingsbackendinternal.h | 2 +- + gio/gsettingsschema-internal.h | 2 +- + gio/gsettingsschema.c | 2 +- + gio/gsettingsschema.h | 2 +- + gio/gsimpleaction.c | 8 ++++---- + gio/gsimpleaction.h | 8 ++++---- + gio/gsimpleactiongroup.c | 8 ++++---- + gio/gsimpleactiongroup.h | 8 ++++---- + gio/gsimpleasyncresult.c | 2 +- + gio/gsimpleasyncresult.h | 2 +- + gio/gsimpleiostream.c | 8 ++++---- + gio/gsimpleiostream.h | 8 ++++---- + gio/gsimplepermission.c | 2 +- + gio/gsimplepermission.h | 2 +- + gio/gsimpleproxyresolver.c | 2 +- + gio/gsimpleproxyresolver.h | 2 +- + gio/gsocket.c | 2 +- + gio/gsocket.h | 2 +- + gio/gsocketaddress.c | 2 +- + gio/gsocketaddress.h | 2 +- + gio/gsocketaddressenumerator.c | 2 +- + gio/gsocketaddressenumerator.h | 2 +- + gio/gsocketclient.c | 2 +- + gio/gsocketclient.h | 8 ++++---- + gio/gsocketconnectable.c | 2 +- + gio/gsocketconnectable.h | 2 +- + gio/gsocketconnection.c | 2 +- + gio/gsocketconnection.h | 8 ++++---- + gio/gsocketcontrolmessage.c | 8 ++++---- + gio/gsocketcontrolmessage.h | 8 ++++---- + gio/gsocketinputstream.c | 2 +- + gio/gsocketinputstream.h | 8 ++++---- + gio/gsocketlistener.c | 2 +- + gio/gsocketlistener.h | 8 ++++---- + gio/gsocketoutputstream.c | 2 +- + gio/gsocketoutputstream.h | 8 ++++---- + gio/gsocketservice.c | 8 ++++---- + gio/gsocketservice.h | 8 ++++---- + gio/gsocks4aproxy.c | 2 +- + gio/gsocks4aproxy.h | 2 +- + gio/gsocks4proxy.c | 2 +- + gio/gsocks4proxy.h | 2 +- + gio/gsocks5proxy.c | 2 +- + gio/gsocks5proxy.h | 2 +- + gio/gsrvtarget.c | 2 +- + gio/gsrvtarget.h | 2 +- + gio/gsubprocess.c | 8 ++++---- + gio/gsubprocess.h | 2 +- + gio/gsubprocesslauncher-private.h | 2 +- + gio/gsubprocesslauncher.c | 8 ++++---- + gio/gsubprocesslauncher.h | 2 +- + gio/gtask.c | 2 +- + gio/gtask.h | 2 +- + gio/gtcpconnection.c | 8 ++++---- + gio/gtcpconnection.h | 8 ++++---- + gio/gtcpwrapperconnection.c | 2 +- + gio/gtcpwrapperconnection.h | 8 ++++---- + gio/gtestdbus.c | 2 +- + gio/gtestdbus.h | 2 +- + gio/gthemedicon.c | 2 +- + gio/gthemedicon.h | 2 +- + gio/gthreadedresolver.c | 2 +- + gio/gthreadedresolver.h | 2 +- + gio/gthreadedsocketservice.c | 8 ++++---- + gio/gthreadedsocketservice.h | 8 ++++---- + gio/gtlsbackend.c | 2 +- + gio/gtlsbackend.h | 2 +- + gio/gtlscertificate.c | 2 +- + gio/gtlscertificate.h | 2 +- + gio/gtlsclientconnection.c | 2 +- + gio/gtlsclientconnection.h | 2 +- + gio/gtlsconnection.c | 2 +- + gio/gtlsconnection.h | 2 +- + gio/gtlsdatabase.c | 2 +- + gio/gtlsdatabase.h | 2 +- + gio/gtlsfiledatabase.c | 2 +- + gio/gtlsfiledatabase.h | 8 ++++---- + gio/gtlsinteraction.c | 2 +- + gio/gtlsinteraction.h | 2 +- + gio/gtlspassword.c | 2 +- + gio/gtlspassword.h | 2 +- + gio/gtlsserverconnection.c | 2 +- + gio/gtlsserverconnection.h | 2 +- + gio/gunionvolumemonitor.c | 2 +- + gio/gunionvolumemonitor.h | 2 +- + gio/gunixconnection.c | 8 ++++---- + gio/gunixconnection.h | 8 ++++---- + gio/gunixcredentialsmessage.c | 8 ++++---- + gio/gunixcredentialsmessage.h | 8 ++++---- + gio/gunixfdlist.c | 8 ++++---- + gio/gunixfdlist.h | 8 ++++---- + gio/gunixfdmessage.c | 8 ++++---- + gio/gunixfdmessage.h | 8 ++++---- + gio/gunixinputstream.c | 2 +- + gio/gunixinputstream.h | 2 +- + gio/gunixmount.c | 2 +- + gio/gunixmount.h | 2 +- + gio/gunixmounts.c | 2 +- + gio/gunixmounts.h | 2 +- + gio/gunixoutputstream.c | 2 +- + gio/gunixoutputstream.h | 2 +- + gio/gunixsocketaddress.c | 2 +- + gio/gunixsocketaddress.h | 2 +- + gio/gunixvolume.c | 2 +- + gio/gunixvolume.h | 2 +- + gio/gunixvolumemonitor.c | 2 +- + gio/gunixvolumemonitor.h | 2 +- + gio/gvfs.c | 2 +- + gio/gvfs.h | 2 +- + gio/gvolume.c | 2 +- + gio/gvolume.h | 2 +- + gio/gvolumemonitor.c | 2 +- + gio/gvolumemonitor.h | 2 +- + gio/gwin32appinfo.c | 2 +- + gio/gwin32appinfo.h | 2 +- + gio/gwin32inputstream.c | 2 +- + gio/gwin32inputstream.h | 2 +- + gio/gwin32mount.c | 2 +- + gio/gwin32mount.h | 2 +- + gio/gwin32networking.h | 2 +- + gio/gwin32outputstream.c | 2 +- + gio/gwin32outputstream.h | 2 +- + gio/gwin32registrykey.c | 2 +- + gio/gwin32registrykey.h | 2 +- + gio/gwin32volumemonitor.c | 2 +- + gio/gwin32volumemonitor.h | 2 +- + gio/gzlibcompressor.c | 2 +- + gio/gzlibcompressor.h | 2 +- + gio/gzlibdecompressor.c | 2 +- + gio/gzlibdecompressor.h | 2 +- + gio/strinfo.c | 2 +- + gio/thumbnail-verify.c | 2 +- + gio/thumbnail-verify.h | 2 +- + 468 files changed, 651 insertions(+), 651 deletions(-) + +commit 90afd3b77530ba8de1eb57ee79a017528b77c6cd +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Fri May 26 16:15:09 2017 +0200 + + gio/xdgmime/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/xdgmime/xdgmime.c | 2 +- + gio/xdgmime/xdgmime.h | 2 +- + gio/xdgmime/xdgmimealias.c | 2 +- + gio/xdgmime/xdgmimealias.h | 2 +- + gio/xdgmime/xdgmimecache.c | 2 +- + gio/xdgmime/xdgmimecache.h | 2 +- + gio/xdgmime/xdgmimeglob.c | 2 +- + gio/xdgmime/xdgmimeglob.h | 2 +- + gio/xdgmime/xdgmimeicon.c | 2 +- + gio/xdgmime/xdgmimeicon.h | 2 +- + gio/xdgmime/xdgmimeint.c | 2 +- + gio/xdgmime/xdgmimeint.h | 2 +- + gio/xdgmime/xdgmimemagic.c | 2 +- + gio/xdgmime/xdgmimemagic.h | 2 +- + gio/xdgmime/xdgmimeparent.c | 2 +- + gio/xdgmime/xdgmimeparent.h | 2 +- + 16 files changed, 16 insertions(+), 16 deletions(-) + +commit 408381b8aeb24155f6d0d7ffd6eab3b59732ecdf +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:32:59 2017 +0100 + + gio/win32/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/win32/gwin32filemonitor.c | 2 +- + gio/win32/gwin32filemonitor.h | 2 +- + gio/win32/gwin32fsmonitorutils.c | 2 +- + gio/win32/gwin32fsmonitorutils.h | 2 +- + gio/win32/gwinhttpfile.c | 2 +- + gio/win32/gwinhttpfile.h | 2 +- + gio/win32/gwinhttpfileinputstream.c | 2 +- + gio/win32/gwinhttpfileinputstream.h | 2 +- + gio/win32/gwinhttpfileoutputstream.c | 2 +- + gio/win32/gwinhttpfileoutputstream.h | 2 +- + gio/win32/gwinhttpvfs.c | 2 +- + gio/win32/gwinhttpvfs.h | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +commit d9a44b66af1f6a54785651aa313f684f36bfdd89 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Sat May 27 17:19:21 2017 +0200 + + gio/tests/: LGPLv2+ -> LGPLv2.1+ + + A lot of tests in gio/tests/ don't have a license header. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/tests/cancellable.c | 2 +- + gio/tests/dbus-appinfo.c | 8 ++++---- + gio/tests/dbus-launch.c | 2 +- + gio/tests/defaultvalue.c | 10 +++++----- + gio/tests/desktop-app-info.c | 2 +- + gio/tests/filter-cat.c | 2 +- + gio/tests/filter-streams.c | 8 ++++---- + gio/tests/gdbus-addresses.c | 2 +- + gio/tests/gdbus-auth.c | 2 +- + gio/tests/gdbus-bz627724.c | 2 +- + gio/tests/gdbus-close-pending.c | 2 +- + gio/tests/gdbus-connection-flush-helper.c | 2 +- + gio/tests/gdbus-connection-flush.c | 2 +- + gio/tests/gdbus-connection-loss.c | 2 +- + gio/tests/gdbus-connection-slow.c | 2 +- + gio/tests/gdbus-connection.c | 2 +- + gio/tests/gdbus-error.c | 2 +- + gio/tests/gdbus-exit-on-close.c | 2 +- + gio/tests/gdbus-export.c | 2 +- + gio/tests/gdbus-introspection.c | 2 +- + gio/tests/gdbus-message.c | 2 +- + gio/tests/gdbus-names.c | 2 +- + gio/tests/gdbus-non-socket.c | 2 +- + gio/tests/gdbus-overflow.c | 2 +- + gio/tests/gdbus-peer-object-manager.c | 2 +- + gio/tests/gdbus-peer.c | 2 +- + gio/tests/gdbus-proxy-threads.c | 2 +- + gio/tests/gdbus-proxy-well-known-name.c | 2 +- + gio/tests/gdbus-proxy.c | 2 +- + gio/tests/gdbus-serialization.c | 2 +- + gio/tests/gdbus-sessionbus.c | 2 +- + gio/tests/gdbus-sessionbus.h | 2 +- + gio/tests/gdbus-test-codegen.c | 2 +- + gio/tests/gdbus-tests.c | 2 +- + gio/tests/gdbus-tests.h | 2 +- + gio/tests/gdbus-threading.c | 2 +- + gio/tests/gdbus-unix-addresses.c | 2 +- + gio/tests/glistmodel.c | 2 +- + gio/tests/gnotification-server.c | 8 ++++---- + gio/tests/gnotification-server.h | 8 ++++---- + gio/tests/gnotification.c | 8 ++++---- + gio/tests/gtesttlsbackend.c | 2 +- + gio/tests/gtesttlsbackend.h | 2 +- + gio/tests/gtlsconsoleinteraction.c | 2 +- + gio/tests/gtlsconsoleinteraction.h | 2 +- + gio/tests/network-monitor.c | 2 +- + gio/tests/pollable.c | 2 +- + gio/tests/proxy-test.c | 2 +- + gio/tests/proxy.c | 2 +- + gio/tests/resolver.c | 2 +- + gio/tests/resources.c | 2 +- + gio/tests/simple-async-result.c | 8 ++++---- + gio/tests/simple-proxy.c | 2 +- + gio/tests/sleepy-stream.c | 8 ++++---- + gio/tests/socket-listener.c | 2 +- + gio/tests/socket-service.c | 2 +- + gio/tests/socket.c | 2 +- + gio/tests/stream-rw_all.c | 8 ++++---- + gio/tests/task.c | 8 ++++---- + gio/tests/test-io-stream.c | 2 +- + gio/tests/test-io-stream.h | 2 +- + gio/tests/test-pipe-unix.c | 2 +- + gio/tests/test-pipe-unix.h | 2 +- + gio/tests/tls-certificate.c | 2 +- + gio/tests/tls-interaction.c | 2 +- + 65 files changed, 96 insertions(+), 96 deletions(-) + +commit 6000f25e4f2c927787e7e4a6b99a8604df9306d0 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:51:09 2017 +0100 + + gio/inotify/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/inotify/ginotifyfilemonitor.c | 2 +- + gio/inotify/ginotifyfilemonitor.h | 2 +- + gio/inotify/inotify-helper.c | 8 ++++---- + gio/inotify/inotify-helper.h | 8 ++++---- + gio/inotify/inotify-kernel.c | 8 ++++---- + gio/inotify/inotify-kernel.h | 8 ++++---- + gio/inotify/inotify-missing.c | 8 ++++---- + gio/inotify/inotify-missing.h | 8 ++++---- + gio/inotify/inotify-path.c | 8 ++++---- + gio/inotify/inotify-path.h | 8 ++++---- + gio/inotify/inotify-sub.c | 8 ++++---- + gio/inotify/inotify-sub.h | 8 ++++---- + 12 files changed, 42 insertions(+), 42 deletions(-) + +commit ae4bac0ada63ee000bb90a83fda3c3e9526c775c +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Fri May 26 16:08:19 2017 +0200 + + gio/gvdb/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/gvdb/gvdb-builder.c | 2 +- + gio/gvdb/gvdb-builder.h | 2 +- + gio/gvdb/gvdb-format.h | 2 +- + gio/gvdb/gvdb-reader.c | 2 +- + gio/gvdb/gvdb-reader.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 0fedc90fac1520412b98626566546fac18143d78 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:44:41 2017 +0100 + + gio/gdbus-2.0/codegen/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/gdbus-2.0/codegen/__init__.py | 2 +- + gio/gdbus-2.0/codegen/codegen.py | 2 +- + gio/gdbus-2.0/codegen/codegen_docbook.py | 2 +- + gio/gdbus-2.0/codegen/codegen_main.py | 2 +- + gio/gdbus-2.0/codegen/config.py.in | 2 +- + gio/gdbus-2.0/codegen/dbustypes.py | 2 +- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- + gio/gdbus-2.0/codegen/parser.py | 2 +- + gio/gdbus-2.0/codegen/utils.py | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +commit 57cd1b42394e4d30a1e3a50178cd1acaed6b729d +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:37:16 2017 +0100 + + gio/fam/: LGPLv2+ -> LGPLv2.1+ + + There is only one *.c file in gio/fam/. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gio/fam/gfamfilemonitor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fae61260c63ac1347fe701f10b30ceb2e7428256 +Author: Philip Withnall <withnall@endlessm.com> +Date: Mon May 29 11:24:09 2017 +0100 + + gtlspassword: Fix a typo in a translatable string + + Singular/Plural mismatch. + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + gio/gtlspassword.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d865ffa4d56a90dc0539f89ea9f04a5d9671c441 +Author: Juan R. Garcia Blanco <jgblanco.mail@gmail.com> +Date: Tue Oct 4 21:17:00 2011 +0200 + + gtlspassword: Comment for translators added + + With tweaks by Philip Withnall <philip@tecnocode.co.uk>. + + https://bugzilla.gnome.org/show_bug.cgi?id=658446 + + gio/gtlspassword.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 646041bc288c8405ce50d67910eadedf6d68e1f0 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Sat May 27 10:51:56 2017 -0400 + + Allow ltp 1.12 + + It works just fine, in my testing. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f41633efd86b7e9959c2bb7f2d33873944c0ec5 +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Sat May 27 00:21:39 2017 +0800 + + gio/gdbusprivate.c: Include missed headers + + This ensures the needed GTYPE_*'s can be found during the build + + gio/gdbusprivate.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit b5e8e4eea95aa429897ecb8a931d8985edb8b4c2 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Wed May 24 18:18:32 2017 -0400 + + GApplication: Remove some unused members + + All the menu handling is in GtkApplication, these fields + are entirely unused, and can go away. + + https://bugzilla.gnome.org/show_bug.cgi?id=783061 + + gio/gapplication.c | 3 --- + 1 file changed, 3 deletions(-) + +commit 6b948d9613f2dcdec72828f3429ba01403063ff2 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:09:06 2017 +0100 + + gobject/: LGPLv2+ -> LGPLv2.1+ + + All gobject/*.{c,h} files have been processed. + + gmarshal.c and gmarshal.h don't have a license header. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gobject/gatomicarray.c | 2 +- + gobject/gatomicarray.h | 2 +- + gobject/gbinding.c | 2 +- + gobject/gbinding.h | 2 +- + gobject/gboxed.c | 2 +- + gobject/gboxed.h | 2 +- + gobject/gclosure.c | 2 +- + gobject/gclosure.h | 2 +- + gobject/genums.c | 2 +- + gobject/genums.h | 2 +- + gobject/glib-genmarshal.c | 2 +- + gobject/glib-types.h | 2 +- + gobject/gobject-autocleanups.h | 2 +- + gobject/gobject-query.c | 2 +- + gobject/gobject.c | 2 +- + gobject/gobject.h | 2 +- + gobject/gobject_trace.h | 2 +- + gobject/gobjectnotifyqueue.c | 2 +- + gobject/gparam.c | 2 +- + gobject/gparam.h | 2 +- + gobject/gparamspecs.c | 2 +- + gobject/gparamspecs.h | 2 +- + gobject/gsignal.c | 2 +- + gobject/gsignal.h | 2 +- + gobject/gsourceclosure.c | 2 +- + gobject/gsourceclosure.h | 2 +- + gobject/gtype-private.h | 2 +- + gobject/gtype.c | 2 +- + gobject/gtype.h | 2 +- + gobject/gtypemodule.c | 2 +- + gobject/gtypemodule.h | 2 +- + gobject/gtypeplugin.c | 2 +- + gobject/gtypeplugin.h | 2 +- + gobject/gvalue.c | 2 +- + gobject/gvalue.h | 2 +- + gobject/gvaluearray.c | 2 +- + gobject/gvaluearray.h | 2 +- + gobject/gvaluecollector.h | 2 +- + gobject/gvaluetransform.c | 2 +- + gobject/gvaluetypes.c | 2 +- + gobject/gvaluetypes.h | 2 +- + 41 files changed, 41 insertions(+), 41 deletions(-) + +commit 308bc41fb90b500a6c383d09c2251ec45f4aa38f +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:15:39 2017 +0100 + + gobject/tests/: LGPLv2+ -> LGPLv2.1+ + + A lot of tests in gobject/tests/ don't have a license header. And some + tests are licensed under a BSD-style license. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gobject/tests/ifaceproperties.c | 2 +- + gobject/tests/qdata.c | 8 ++++---- + gobject/tests/testcommon.h | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit feacdabb3f64f2702a0033cfeb4c1a8f032d10e8 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 14:02:45 2017 +0100 + + gthread/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gthread/gthread-impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ca82612a6cba64dc1d036dc161ee44ba6e98c529 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 13:53:32 2017 +0100 + + gmodule/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + gmodule/COPYING | 216 + ++++++++++++++++++++++++-------------------- + gmodule/gmodule-ar.c | 2 +- + gmodule/gmodule-dl.c | 2 +- + gmodule/gmodule-dyld.c | 2 +- + gmodule/gmodule-win32.c | 2 +- + gmodule/gmodule.c | 2 +- + gmodule/gmodule.h | 2 +- + gmodule/gmoduleconf.h.in | 2 +- + gmodule/gmoduleconf.h.win32 | 2 +- + 9 files changed, 126 insertions(+), 106 deletions(-) + +commit f9faac7661fb84a1c7f998a76c7e89280a17b7b9 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Thu Jan 5 12:47:07 2017 +0100 + + glib/: LGPLv2+ -> LGPLv2.1+ + + All glib/*.{c,h} files have been processed, as well as gtester-report. + + 12 of those files are not licensed under LGPL: + + gbsearcharray.h + gconstructor.h + glibintl.h + gmirroringtable.h + gscripttable.h + gtranslit-data.h + gunibreak.h + gunichartables.h + gunicomp.h + gunidecomp.h + valgrind.h + win_iconv.c + + Some of them are generated files, some are licensed under a BSD-style + license and win_iconv.c is in the public domain. + + Sub-directories inside glib/: + + deprecated/: processed in a previous commit + glib-mirroring-tab/: already LGPLv2.1+ + gnulib/: not modified, the code is copied from gnulib + libcharset/: a copy + pcre/: a copy + tests/: processed in a previous commit + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + glib/docs.c | 2 +- + glib/galloca.h | 2 +- + glib/garray.c | 2 +- + glib/garray.h | 2 +- + glib/gasyncqueue.c | 2 +- + glib/gasyncqueue.h | 2 +- + glib/gasyncqueueprivate.h | 2 +- + glib/gatomic.c | 8 ++++---- + glib/gatomic.h | 8 ++++---- + glib/gbacktrace.c | 2 +- + glib/gbacktrace.h | 2 +- + glib/gbase64.c | 10 +++++----- + glib/gbase64.h | 10 +++++----- + glib/gbitlock.c | 2 +- + glib/gbitlock.h | 2 +- + glib/gbookmarkfile.c | 8 ++++---- + glib/gbookmarkfile.h | 8 ++++---- + glib/gbytes.c | 2 +- + glib/gbytes.h | 2 +- + glib/gcharset.c | 2 +- + glib/gcharset.h | 2 +- + glib/gcharsetprivate.h | 2 +- + glib/gchecksum.c | 10 +++++----- + glib/gchecksum.h | 10 +++++----- + glib/gconvert.c | 2 +- + glib/gconvert.h | 2 +- + glib/gdataset.c | 2 +- + glib/gdataset.h | 2 +- + glib/gdatasetprivate.h | 2 +- + glib/gdate.c | 2 +- + glib/gdate.h | 2 +- + glib/gdir.c | 2 +- + glib/gdir.h | 2 +- + glib/genviron.c | 2 +- + glib/genviron.h | 2 +- + glib/gerror.c | 2 +- + glib/gerror.h | 2 +- + glib/gfileutils.c | 2 +- + glib/gfileutils.h | 2 +- + glib/ggettext.c | 2 +- + glib/ggettext.h | 2 +- + glib/ghash.c | 2 +- + glib/ghash.h | 2 +- + glib/ghmac.c | 10 +++++----- + glib/ghmac.h | 10 +++++----- + glib/ghook.c | 2 +- + glib/ghook.h | 2 +- + glib/ghostutils.c | 2 +- + glib/ghostutils.h | 2 +- + glib/gi18n-lib.h | 2 +- + glib/gi18n.h | 2 +- + glib/giochannel.c | 2 +- + glib/giochannel.h | 2 +- + glib/giounix.c | 2 +- + glib/giowin32.c | 2 +- + glib/gkeyfile.c | 2 +- + glib/gkeyfile.h | 2 +- + glib/glib-autocleanups.h | 2 +- + glib/glib-init.c | 8 ++++---- + glib/glib-init.h | 8 ++++---- + glib/glib-object.h | 2 +- + glib/glib-private.c | 2 +- + glib/glib-private.h | 10 +++++----- + glib/glib-unix.c | 2 +- + glib/glib-unix.h | 10 +++++----- + glib/glib.h | 2 +- + glib/glib_trace.h | 2 +- + glib/glist.c | 2 +- + glib/glist.h | 2 +- + glib/gmacros.h | 2 +- + glib/gmain-internal.h | 10 +++++----- + glib/gmain.c | 2 +- + glib/gmain.h | 10 +++++----- + glib/gmappedfile.c | 2 +- + glib/gmappedfile.h | 2 +- + glib/gmarkup.c | 2 +- + glib/gmarkup.h | 2 +- + glib/gmem.c | 2 +- + glib/gmem.h | 2 +- + glib/gmessages.c | 2 +- + glib/gmessages.h | 2 +- + glib/gnode.c | 2 +- + glib/gnode.h | 2 +- + glib/goption.c | 10 +++++----- + glib/goption.h | 12 ++++++------ + glib/gpattern.c | 2 +- + glib/gpattern.h | 2 +- + glib/gpoll.c | 2 +- + glib/gpoll.h | 12 ++++++------ + glib/gprimes.c | 2 +- + glib/gprimes.h | 2 +- + glib/gprintf.c | 2 +- + glib/gprintf.h | 2 +- + glib/gprintfint.h | 2 +- + glib/gqsort.c | 2 +- + glib/gqsort.h | 2 +- + glib/gquark.c | 2 +- + glib/gquark.h | 2 +- + glib/gqueue.c | 2 +- + glib/gqueue.h | 2 +- + glib/grand.c | 2 +- + glib/grand.h | 2 +- + glib/gscanner.c | 2 +- + glib/gscanner.h | 2 +- + glib/gsequence.c | 2 +- + glib/gsequence.h | 2 +- + glib/gshell.c | 2 +- + glib/gshell.h | 2 +- + glib/gslice.c | 2 +- + glib/gslice.h | 2 +- + glib/gslist.c | 2 +- + glib/gslist.h | 2 +- + glib/gspawn-win32-helper.c | 2 +- + glib/gspawn-win32.c | 2 +- + glib/gspawn.c | 2 +- + glib/gspawn.h | 2 +- + glib/gstdio.c | 2 +- + glib/gstdio.h | 2 +- + glib/gstrfuncs.c | 2 +- + glib/gstrfuncs.h | 2 +- + glib/gstring.c | 2 +- + glib/gstring.h | 2 +- + glib/gstringchunk.c | 2 +- + glib/gstringchunk.h | 2 +- + glib/gtester-report | 2 +- + glib/gtester.c | 2 +- + glib/gtestutils.c | 2 +- + glib/gtestutils.h | 2 +- + glib/gthread-posix.c | 2 +- + glib/gthread-win32.c | 2 +- + glib/gthread.c | 2 +- + glib/gthread.h | 8 ++++---- + glib/gthreadpool.c | 2 +- + glib/gthreadpool.h | 2 +- + glib/gthreadprivate.h | 2 +- + glib/gtimer.c | 2 +- + glib/gtimer.h | 2 +- + glib/gtimezone.c | 2 +- + glib/gtimezone.h | 8 ++++---- + glib/gtranslit.c | 2 +- + glib/gtrashstack.c | 2 +- + glib/gtrashstack.h | 2 +- + glib/gtree.c | 2 +- + glib/gtree.h | 2 +- + glib/gtypes.h | 2 +- + glib/gunibreak.c | 2 +- + glib/gunicode.h | 2 +- + glib/gunicodeprivate.h | 2 +- + glib/gunicollate.c | 2 +- + glib/gunidecomp.c | 2 +- + glib/guniprop.c | 2 +- + glib/gurifuncs.c | 2 +- + glib/gurifuncs.h | 2 +- + glib/gutf8.c | 2 +- + glib/gutils.c | 2 +- + glib/gutils.h | 2 +- + glib/gvariant-core.c | 2 +- + glib/gvariant-core.h | 2 +- + glib/gvariant-internal.h | 2 +- + glib/gvariant-parser.c | 2 +- + glib/gvariant-serialiser.c | 2 +- + glib/gvariant-serialiser.h | 2 +- + glib/gvariant.c | 2 +- + glib/gvariant.h | 2 +- + glib/gvarianttype.c | 2 +- + glib/gvarianttype.h | 2 +- + glib/gvarianttypeinfo.c | 2 +- + glib/gvarianttypeinfo.h | 2 +- + glib/gversion.c | 2 +- + glib/gversion.h | 2 +- + glib/gversionmacros.h | 2 +- + glib/gwakeup.c | 2 +- + glib/gwakeup.h | 2 +- + glib/gwin32.c | 2 +- + glib/gwin32.h | 2 +- + 175 files changed, 253 insertions(+), 253 deletions(-) + +commit 95cad9c3e0ba1d45ea8e1295505c50b6ac647a85 +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Tue Dec 27 14:59:46 2016 +0100 + + glib/tests/: LGPLv2+ -> LGPLv2.1+ + + There are other tests in glib/tests/ that are licensed under + a BSD-style + license, and other tests that don't have any license header. + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + glib/tests/1bit-mutex.c | 8 ++++---- + glib/tests/642026.c | 8 ++++---- + glib/tests/array-test.c | 2 +- + glib/tests/atomic.c | 8 ++++---- + glib/tests/bytes.c | 8 ++++---- + glib/tests/cache.c | 2 +- + glib/tests/convert.c | 2 +- + glib/tests/gvariant.c | 2 +- + glib/tests/hash.c | 2 +- + glib/tests/hostutils.c | 2 +- + glib/tests/markup-collect.c | 8 ++++---- + glib/tests/markup-subparser.c | 8 ++++---- + glib/tests/node.c | 2 +- + glib/tests/overflow.c | 2 +- + glib/tests/pattern.c | 2 +- + glib/tests/regex.c | 2 +- + glib/tests/scannerapi.c | 2 +- + glib/tests/shell.c | 2 +- + glib/tests/sort.c | 2 +- + glib/tests/tree.c | 2 +- + glib/tests/uri.c | 2 +- + glib/tests/utf8-performance.c | 2 +- + glib/tests/utf8-pointer.c | 2 +- + glib/tests/utf8-validate.c | 2 +- + 24 files changed, 42 insertions(+), 42 deletions(-) + +commit e7a6cd1cb6fef3a3b433b35557b727ca66ff2cec +Author: Sébastien Wilmet <swilmet@gnome.org> +Date: Tue Dec 27 14:43:38 2016 +0100 + + glib/deprecated/: LGPLv2+ -> LGPLv2.1+ + + https://bugzilla.gnome.org/show_bug.cgi?id=776504 + + glib/deprecated/gallocator.c | 2 +- + glib/deprecated/gallocator.h | 2 +- + glib/deprecated/gcache.c | 2 +- + glib/deprecated/gcache.h | 2 +- + glib/deprecated/gcompletion.c | 2 +- + glib/deprecated/gcompletion.h | 2 +- + glib/deprecated/gmain.h | 2 +- + glib/deprecated/grel.c | 2 +- + glib/deprecated/grel.h | 2 +- + glib/deprecated/gthread-deprecated.c | 2 +- + glib/deprecated/gthread.h | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +commit e9846a7c8f8bdac48470778ddd6f1532a93fdf89 +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Wed May 24 15:43:59 2017 +0800 + + Visual Studio builds: Redo utility script generation + + Use the new gen_util_scripts.py script to generate the glib-mkenums + and + gdbus-codegen scripts with the proper info in them so that they can be + used properly by other build systems such as Meson, during "install". + + win32/vs10/glib-gen-srcs.props | 4 -- + win32/vs10/glib-install.propsin | 14 ++++++- + win32/vs10/glib-install.vcxproj | 22 +++++++++-- + win32/vs10/glib-install.vcxproj.filters | 4 +- + win32/vs10/gobject.vcxproj.filtersin | 7 +--- + win32/vs10/gobject.vcxprojin | 18 ++------- + win32/vs9/glib-gen-srcs.vsprops | 4 -- + win32/vs9/glib-install.vcproj | 68 + +++++++++++++++++++++++++++++++++ + win32/vs9/glib-install.vspropsin | 10 ++++- + win32/vs9/gobject.vcprojin | 42 ++------------------ + 10 files changed, 121 insertions(+), 72 deletions(-) + +commit 79e73da2e52e860015860e68d13e5f4840238cfc +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Wed May 24 13:16:55 2017 +0800 + + win32/gen_util_scripts.py: Make it path agnostic + + win32/gen_util_scripts.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit c5cd5bcd9738b09ccf175d01df5a4ff910aca368 +Author: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Wed May 24 12:55:37 2017 +0800 + + Visual Studio builds: Add script to generate utility scripts + + This will allow the utility scripts glib-mkenums and gdbus-codegen be + generated with the proper info in them, as build systems such as Meson + might look for shebang lines to determine the commands that need to be + called to invoke the scripts (which is necessary for calling these + scripts on standard Windows cmd.exe) + + win32/Makefile.am | 3 ++- + win32/gen_util_scripts.py | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 1 deletion(-) + +commit a05b64a0cb234fffad12af0ca052296a1bae4a85 +Author: Philip Withnall <withnall@endlessm.com> +Date: Tue May 23 13:28:19 2017 +0100 + + build: Use AM_TESTS_ENVIRONMENT rather than TESTS_ENVIRONMENT + + TESTS_ENVIRONMENT is reserved for the user to be able to set when + running the tests. AM_TESTS_ENVIRONMENT is for the tests’ + Makefile to + set itself. + + https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html + + Signed-off-by: Philip Withnall <withnall@endlessm.com> + + https://bugzilla.gnome.org/show_bug.cgi?id=782996 + + glib-tap.mk | 2 +- + tests/Makefile.am | 2 +- + tests/gobject/Makefile.am | 2 +- + tests/refcount/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + commit af3f141c091fe6b03fcb27e0cd680beac96e5ccd Author: Matthias Clasen <mclasen@redhat.com> Date: Mon May 22 14:01:31 2017 -0400 @@ -1,8 +1,8 @@ Simple install procedure ======================== - % tar xf glib-2.53.2.tar.gz # unpack the sources - % cd glib-2.53.2 # change to the toplevel directory + % tar xf glib-2.53.3.tar.gz # unpack the sources + % cd glib-2.53.3 # change to the toplevel directory % ./configure # run the `configure' script % make # build GLIB diff --git a/Makefile.in b/Makefile.in index 679b85b95..b1bb5aed5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -439,7 +439,7 @@ am__DIST_COMMON = $(srcdir)/INSTALL.in $(srcdir)/Makefile.in \ $(srcdir)/gobject-2.0.pc.in $(srcdir)/gthread-2.0.pc.in \ $(top_srcdir)/glib.mk AUTHORS COPYING ChangeLog INSTALL NEWS \ README compile config.guess config.sub install-sh ltmain.sh \ - missing py-compile test-driver + missing test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -1,3 +1,36 @@ +Overview of changes in GLib 2.53.3 +================================== + +* Bugs fixed: + 658446 Add translation comment for wrong password notice string + 661926 Improve the default logging setup in GLib + 674885 type initialisation deadlock in GObject + 775593 GIO cannot write symlinks on FreeBSD and NetBSD + 776169 Various gio-tool fixes + 776333 Fix annotation on g_file_copy_async() + 776504 Upgrade license from LGPLv2+ to LGPLv2.1+ + 777307 race condition between gdbus signal callback and g_bus_unwatch_name... + 778422 gsubprocesslauncher: Clarify the behavior of set_environ() + 781301 Stack pointer corrupted by incorrect call of NtNotifyChangeMultipleKeys + 782336 Add additional documentation of the GResource XML format + 782996 build: Use AM_TESTS_ENVIRONMENT rather than TESTS_ENVIRONMENT + 783061 GApplication: Remove some unused members + 783130 Make dbus activation sandbox-aware + 783193 Adapt to OpenURI api change + 783201 gdbus-codegen: Apply --output-directory to generated docs as well + 783340 win32: port monotonic times to use QPC + 783350 length parameter can be NULL g_data_input_stream_read_line + 783392 incorrect (out) annotation for g_dbus_interface_info_generate_xml + 783593 GGtkNotificationBackend should use /org/freedesktop/DBus to call Ge... + +* Translation updates: + Esperanto + German + Indonesian + Kazakh + Spanish + + Overview of changes in GLib 2.53.2 ================================== @@ -1,7 +1,7 @@ General Information =================== -This is GLib version 2.53.2. GLib is the low-level core +This is GLib version 2.53.3. GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, diff --git a/config.h.win32 b/config.h.win32 index 342f3bf17..2a134b42f 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -38,7 +38,7 @@ #define GETTEXT_PACKAGE "glib20" /* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE 5302 +#define GLIB_BINARY_AGE 5303 /* Define to the GLIB interface age */ #define GLIB_INTERFACE_AGE 0 @@ -50,15 +50,15 @@ #define GLIB_MAJOR_VERSION 2 /* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION 2 +#define GLIB_MICRO_VERSION 3 /* Define to the GLIB minor version */ #define GLIB_MINOR_VERSION 53 /* A 'va_copy' style function */ -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#else /* _MSC_VER */ +#else /* _MSC_VER && _MSC_VER < 1800 */ /* #undef G_VA_COPY */ #endif /* _MSC_VER */ @@ -690,7 +690,7 @@ #define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib 2.53.2" +#define PACKAGE_STRING "glib 2.53.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glib" @@ -699,7 +699,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.53.2" +#define PACKAGE_VERSION "2.53.3" /* define if posix_memalign() can allocate any size */ /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */ diff --git a/config.h.win32.in b/config.h.win32.in index b1c69df20..eaf7e2818 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -56,9 +56,9 @@ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ /* A 'va_copy' style function */ -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#else /* _MSC_VER */ +#else /* _MSC_VER && _MSC_VER < 1800 */ /* #undef G_VA_COPY */ #endif /* _MSC_VER */ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glib 2.53.2. +# Generated by GNU Autoconf 2.69 for glib 2.53.3. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glib>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='glib' PACKAGE_TARNAME='glib' -PACKAGE_VERSION='2.53.2' -PACKAGE_STRING='glib 2.53.2' +PACKAGE_VERSION='2.53.3' +PACKAGE_STRING='glib 2.53.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib' PACKAGE_URL='' @@ -1589,7 +1589,7 @@ if test "$ac_init_help" = "long"; then # 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 glib 2.53.2 to adapt to many kinds of systems. +\`configure' configures glib 2.53.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1659,7 +1659,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib 2.53.2:";; + short | recursive ) echo "Configuration of glib 2.53.3:";; esac cat <<\_ACEOF @@ -1850,7 +1850,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib configure 2.53.2 +glib configure 2.53.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2680,7 +2680,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib $as_me 2.53.2, which was +It was created by glib $as_me 2.53.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3552,7 +3552,7 @@ fi # Define the identity of the package. PACKAGE='glib' - VERSION='2.53.2' + VERSION='2.53.3' # Some tools Automake needs. @@ -3821,10 +3821,10 @@ AM_BACKSLASH='\' GLIB_MAJOR_VERSION=2 GLIB_MINOR_VERSION=53 -GLIB_MICRO_VERSION=2 +GLIB_MICRO_VERSION=3 GLIB_INTERFACE_AGE=0 -GLIB_BINARY_AGE=5302 -GLIB_VERSION=2.53.2 +GLIB_BINARY_AGE=5303 +GLIB_VERSION=2.53.3 @@ -3840,20 +3840,20 @@ $as_echo "#define GLIB_MAJOR_VERSION 2" >>confdefs.h $as_echo "#define GLIB_MINOR_VERSION 53" >>confdefs.h -$as_echo "#define GLIB_MICRO_VERSION 2" >>confdefs.h +$as_echo "#define GLIB_MICRO_VERSION 3" >>confdefs.h $as_echo "#define GLIB_INTERFACE_AGE 0" >>confdefs.h -$as_echo "#define GLIB_BINARY_AGE 5302" >>confdefs.h +$as_echo "#define GLIB_BINARY_AGE 5303" >>confdefs.h # libtool versioning LT_RELEASE=2.53 -LT_CURRENT=5302 +LT_CURRENT=5303 LT_REVISION=0 -LT_AGE=5302 +LT_AGE=5303 LT_CURRENT_MINUS_AGE=0 @@ -20463,7 +20463,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -glib config.lt 2.53.2 +glib config.lt 2.53.3 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -28788,7 +28788,7 @@ fi as_fn_error $? "ccache must be disabled when --enable-coverage option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 fi - ltp_version_list="1.6 1.7 1.8 1.9 1.10" + ltp_version_list="1.6 1.7 1.8 1.9 1.10 1.12" # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -30189,7 +30189,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib $as_me 2.53.2, which was +This file was extended by glib $as_me 2.53.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30255,7 +30255,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib config.status 2.53.2 +glib config.status 2.53.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index bd4808889..c653a922c 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ m4_define(glib_configure_ac) m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [53]) -m4_define([glib_micro_version], [2]) +m4_define([glib_micro_version], [3]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) @@ -2593,7 +2593,7 @@ AS_IF([ test "x$use_gcov" = "xyes"], [ AC_MSG_ERROR([ccache must be disabled when --enable-coverage option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list="1.6 1.7 1.8 1.9 1.10" + ltp_version_list="1.6 1.7 1.8 1.9 1.10 1.12" AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) diff --git a/docs/reference/gio/gapplication.1 b/docs/reference/gio/gapplication.1 index ed814cef4..4e2eb3a25 100644 --- a/docs/reference/gio/gapplication.1 +++ b/docs/reference/gio/gapplication.1 @@ -2,7 +2,7 @@ .\" Title: gapplication .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gdbus-codegen.1 b/docs/reference/gio/gdbus-codegen.1 index dcd60ff2f..e2d9023d3 100644 --- a/docs/reference/gio/gdbus-codegen.1 +++ b/docs/reference/gio/gdbus-codegen.1 @@ -2,7 +2,7 @@ .\" Title: gdbus-codegen .\" Author: David Zeuthen <zeuthen@gmail.com> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gdbus.1 b/docs/reference/gio/gdbus.1 index 50795dd2f..4e3467111 100644 --- a/docs/reference/gio/gdbus.1 +++ b/docs/reference/gio/gdbus.1 @@ -2,7 +2,7 @@ .\" Title: gdbus .\" Author: David Zeuthen <zeuthen@gmail.com> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gio-querymodules.1 b/docs/reference/gio/gio-querymodules.1 index b4809fea7..92bab6fc0 100644 --- a/docs/reference/gio/gio-querymodules.1 +++ b/docs/reference/gio/gio-querymodules.1 @@ -2,7 +2,7 @@ .\" Title: gio-querymodules .\" Author: Alexander Larsson .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gio.1 b/docs/reference/gio/gio.1 index f127690ab..c9ba0ae12 100644 --- a/docs/reference/gio/gio.1 +++ b/docs/reference/gio/gio.1 @@ -2,7 +2,7 @@ .\" Title: gio .\" Author: Matthias Clasen <mclasen@redhat.com> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/glib-compile-resources.1 b/docs/reference/gio/glib-compile-resources.1 index 632acaa20..7b6473890 100644 --- a/docs/reference/gio/glib-compile-resources.1 +++ b/docs/reference/gio/glib-compile-resources.1 @@ -2,7 +2,7 @@ .\" Title: glib-compile-resources .\" Author: Alexander Larsson .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/glib-compile-schemas.1 b/docs/reference/gio/glib-compile-schemas.1 index b70fe11b1..96493c549 100644 --- a/docs/reference/gio/glib-compile-schemas.1 +++ b/docs/reference/gio/glib-compile-schemas.1 @@ -2,7 +2,7 @@ .\" Title: glib-compile-schemas .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gresource.1 b/docs/reference/gio/gresource.1 index 4fee63b74..207b952a6 100644 --- a/docs/reference/gio/gresource.1 +++ b/docs/reference/gio/gresource.1 @@ -2,7 +2,7 @@ .\" Title: gresource .\" Author: Matthias Clasen .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/gsettings.1 b/docs/reference/gio/gsettings.1 index aca06b2d8..715bed808 100644 --- a/docs/reference/gio/gsettings.1 +++ b/docs/reference/gio/gsettings.1 @@ -2,7 +2,7 @@ .\" Title: gsettings .\" Author: Ryan Lortie .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GIO .\" Language: English diff --git a/docs/reference/gio/html/GDataInputStream.html b/docs/reference/gio/html/GDataInputStream.html index 8c8aca375..9fd904d84 100644 --- a/docs/reference/gio/html/GDataInputStream.html +++ b/docs/reference/gio/html/GDataInputStream.html @@ -811,7 +811,7 @@ was cancelled, the error <a class="link" href="gio-GIOError.html#G-IO-ERROR-CANC <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> @@ -868,7 +868,7 @@ was cancelled, the error <a class="link" href="gio-GIOError.html#G-IO-ERROR-CANC <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> @@ -986,7 +986,7 @@ well.</p> <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>error</p></td> @@ -1042,7 +1042,7 @@ g_data_input_stream_read_line_finish_utf8 <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>error</p></td> @@ -1117,7 +1117,7 @@ nul-terminated</p></td> <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> @@ -1255,7 +1255,7 @@ have to use <a class="link" href="GDataInputStream.html#g-data-input-stream-read <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>error</p></td> @@ -1316,7 +1316,7 @@ does not consume the stop character.</p> <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>cancellable</p></td> @@ -1440,7 +1440,7 @@ g_data_input_stream_read_until_finish (<em class="parameter"><code><a class="lin <tr> <td class="parameter_name"><p>length</p></td> <td class="parameter_description"><p> a <a href="../glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> to get the length of the data read in. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL may be passed instead of a pointer to a location."><span class="acronym">optional</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>error</p></td> diff --git a/docs/reference/gio/html/GFile.html b/docs/reference/gio/html/GFile.html index 44ccee7aa..15bb3f6da 100644 --- a/docs/reference/gio/html/GFile.html +++ b/docs/reference/gio/html/GFile.html @@ -4679,7 +4679,6 @@ run in.</p> <p>When the operation is finished, <em class="parameter"><code>callback</code></em> will be called. You can then call <a class="link" href="GFile.html#g-file-copy-finish" title="g_file_copy_finish ()"><code class="function">g_file_copy_finish()</code></a> to get the result of the operation.</p> -<p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p> <div class="refsect3"> <a name="g-file-copy-async.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -4719,23 +4718,23 @@ run in.</p> <td class="parameter_name"><p>progress_callback</p></td> <td class="parameter_description"><p> function to callback with progress information, or <a href="../glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if progress information is not needed. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="The callback is valid until the GDestroyNotify argument is called."><span class="acronym">scope notified</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>progress_callback_data</p></td> <td class="parameter_description"><p> user data to pass to <em class="parameter"><code>progress_callback</code></em> . </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym> progress_callback][<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>callback</p></td> -<td class="parameter_description"><p>a <a class="link" href="GAsyncResult.html#GAsyncReadyCallback" title="GAsyncReadyCallback ()"><span class="type">GAsyncReadyCallback</span></a> to call when the request is satisfied</p></td> -<td class="parameter_annotations"> </td> +<td class="parameter_description"><p> a <a class="link" href="GAsyncResult.html#GAsyncReadyCallback" title="GAsyncReadyCallback ()"><span class="type">GAsyncReadyCallback</span></a> to call when the request is satisfied. </p></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>user_data</p></td> -<td class="parameter_description"><p>the data to pass to callback function</p></td> -<td class="parameter_annotations"> </td> +<td class="parameter_description"><p> the data to pass to callback function. </p></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym> callback]</span></td> </tr> </tbody> </table></div> diff --git a/docs/reference/gio/html/GResource.html b/docs/reference/gio/html/GResource.html index 73b90d069..bbef36a34 100644 --- a/docs/reference/gio/html/GResource.html +++ b/docs/reference/gio/html/GResource.html @@ -256,6 +256,12 @@ the resource file, rather than an (uncompressed) copy if it. For this, the gdk-p program must be in the PATH, or the <code class="literal">GDK_PIXBUF_PIXDATA</code> environment variable must be set to the full path to the gdk-pixbuf-pixdata executable; otherwise the resource compiler will abort.</p> +<p>Resource files will be exported in the GResource namespace using the +combination of the given <code class="literal">prefix</code> and the filename from the <code class="literal">file</code> element. +The <code class="literal">alias</code> attribute can be used to alter the filename to expose them at a +different location in the resource namespace. Typically, this is used to +include files from a different source directory without exposing the source +directory in the resource namespace, as in the example below.</p> <p>Resource bundles are created by the glib-compile-resources program which takes an XML file that describes the bundle, and a set of files that the XML references. These are combined into a binary resource bundle.</p> @@ -271,13 +277,15 @@ are combined into a binary resource bundle.</p> 5 6 7 -8</pre></td> +8 +9</pre></td> <td class="listing_code"><pre class="programlisting"><span class="gtkdoc opt"><?</span>xml version<span class="gtkdoc opt">=</span><span class="string">"1.0"</span> encoding<span class="gtkdoc opt">=</span><span class="string">"UTF-8"</span><span class="gtkdoc opt">?></span> <span class="gtkdoc opt"><</span>gresources<span class="gtkdoc opt">></span> <span class="gtkdoc opt"><</span>gresource prefix<span class="gtkdoc opt">=</span><span class="string">"/org/gtk/Example"</span><span class="gtkdoc opt">></span> <span class="gtkdoc opt"><</span>file<span class="gtkdoc opt">></span>data<span class="gtkdoc opt">/</span>splashscreen<span class="gtkdoc opt">.</span>png<span class="gtkdoc opt"></</span>file<span class="gtkdoc opt">></span> <span class="gtkdoc opt"><</span>file compressed<span class="gtkdoc opt">=</span><span class="string">"true"</span><span class="gtkdoc opt">></span>dialog<span class="gtkdoc opt">.</span>ui<span class="gtkdoc opt"></</span>file<span class="gtkdoc opt">></span> <span class="gtkdoc opt"><</span>file preprocess<span class="gtkdoc opt">=</span><span class="string">"xml-stripblanks"</span><span class="gtkdoc opt">></span>menumarkup<span class="gtkdoc opt">.</span>xml<span class="gtkdoc opt"></</span>file<span class="gtkdoc opt">></span> + <span class="gtkdoc opt"><</span>file alias<span class="gtkdoc opt">=</span><span class="string">"example.css"</span><span class="gtkdoc opt">></span>data<span class="gtkdoc opt">/</span>example<span class="gtkdoc opt">.</span>css<span class="gtkdoc opt"></</span>file<span class="gtkdoc opt">></span> <span class="gtkdoc opt"></</span>gresource<span class="gtkdoc opt">></span> <span class="gtkdoc opt"></</span>gresources<span class="gtkdoc opt">></span></pre></td> </tr> @@ -293,10 +301,12 @@ are combined into a binary resource bundle.</p> <tr> <td class="listing_lines" align="right"><pre>1 2 -3</pre></td> +3 +4</pre></td> <td class="listing_code"><pre class="programlisting"><span class="gtkdoc opt">/</span>org<span class="gtkdoc opt">/</span>gtk<span class="gtkdoc opt">/</span>Example<span class="gtkdoc opt">/</span>data<span class="gtkdoc opt">/</span>splashscreen<span class="gtkdoc opt">.</span>png <span class="gtkdoc opt">/</span>org<span class="gtkdoc opt">/</span>gtk<span class="gtkdoc opt">/</span>Example<span class="gtkdoc opt">/</span>dialog<span class="gtkdoc opt">.</span>ui -<span class="gtkdoc opt">/</span>org<span class="gtkdoc opt">/</span>gtk<span class="gtkdoc opt">/</span>Example<span class="gtkdoc opt">/</span>menumarkup<span class="gtkdoc opt">.</span>xml</pre></td> +<span class="gtkdoc opt">/</span>org<span class="gtkdoc opt">/</span>gtk<span class="gtkdoc opt">/</span>Example<span class="gtkdoc opt">/</span>menumarkup<span class="gtkdoc opt">.</span>xml +<span class="gtkdoc opt">/</span>org<span class="gtkdoc opt">/</span>gtk<span class="gtkdoc opt">/</span>Example<span class="gtkdoc opt">/</span>example<span class="gtkdoc opt">.</span>css</pre></td> </tr> </tbody> </table> @@ -318,19 +328,21 @@ register the resource so its files can be accessed using using API calls like <a class="link" href="GResource.html#g-resources-open-stream" title="g_resources_open_stream ()"><code class="function">g_resources_open_stream()</code></a> to stream the data or <a class="link" href="GResource.html#g-resources-lookup-data" title="g_resources_lookup_data ()"><code class="function">g_resources_lookup_data()</code></a> to get a direct pointer to the data. You can also use URIs like "resource:///org/gtk/Example/data/splashscreen.png" with <a class="link" href="GFile.html" title="GFile"><span class="type">GFile</span></a> to access the resource data.</p> +<p>Some higher-level APIs, such as <a href="../gtk4/GtkApplication.html#GtkApplication-struct"><span class="type">GtkApplication</span></a>, will automatically load +resources from certain well-known paths in the resource namespace as a +convenience. See the documentation for those APIs for details.</p> <p>There are two forms of the generated source, the default version uses the compiler support for constructor and destructor functions (where available) to automatically create and register the <a class="link" href="GResource.html" title="GResource"><span class="type">GResource</span></a> on startup -or library load time. If you pass --manual-register two functions to register/unregister the resource is instead -created. This requires an explicit initialization call in your application/library, but it works on all platforms, -even on the minor ones where this is not available. (Constructor support is available for at least Win32, Mac OS and Linux.)</p> +or library load time. If you pass <code class="literal">--manual-register</code>, two functions to register/unregister the resource are created +instead. This requires an explicit initialization call in your application/library, but it works on all platforms, +even on the minor ones where constructors are not supported. (Constructor support is available for at least Win32, Mac OS and Linux.)</p> <p>Note that resource data can point directly into the data segment of e.g. a library, so if you are unloading libraries during runtime you need to be very careful with keeping around pointers to data from a resource, as this goes away when the library is unloaded. However, in practice this is not generally a problem, since most resource accesses -is for your own resources, and resource data is often used once, during parsing, and then released.</p> +are for your own resources, and resource data is often used once, during parsing, and then released.</p> <p>When debugging a program or testing a change to an installed version, it is often useful to be able to replace resources in the program or library, without recompiling, for debugging or quick hacking and testing -purposes.</p> -<p>Since GLib 2.50, it is possible to use the <code class="literal">G_RESOURCE_OVERLAYS</code> environment variable to selectively overlay +purposes. Since GLib 2.50, it is possible to use the <code class="literal">G_RESOURCE_OVERLAYS</code> environment variable to selectively overlay resources with replacements from the filesystem. It is a colon-separated list of substitutions to perform during resource lookups.</p> <p>A substitution has the form</p> diff --git a/docs/reference/gio/html/GSubprocessLauncher.html b/docs/reference/gio/html/GSubprocessLauncher.html index 02f1d53e5..8cedc6504 100644 --- a/docs/reference/gio/html/GSubprocessLauncher.html +++ b/docs/reference/gio/html/GSubprocessLauncher.html @@ -360,8 +360,12 @@ the process 'environ' and using the functions <a href="../glib-Miscellaneous-Uti <a href="../glib-Miscellaneous-Utility-Functions.html#g-environ-unsetenv"><code class="function">g_environ_unsetenv()</code></a>, etc.</p> <p>As an alternative, you can use <a class="link" href="GSubprocessLauncher.html#g-subprocess-launcher-setenv" title="g_subprocess_launcher_setenv ()"><code class="function">g_subprocess_launcher_setenv()</code></a>, <a class="link" href="GSubprocessLauncher.html#g-subprocess-launcher-unsetenv" title="g_subprocess_launcher_unsetenv ()"><code class="function">g_subprocess_launcher_unsetenv()</code></a>, etc.</p> -<p>Pass <a href="../glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to inherit the parent process' environment. Pass an -empty array to set an empty environment.</p> +<p>Pass an empty array to set an empty environment. Pass <a href="../glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to inherit the +parent process’ environment. As of GLib 2.54, the parent process’ environment +will be copied when <a class="link" href="GSubprocessLauncher.html#g-subprocess-launcher-set-environ" title="g_subprocess_launcher_set_environ ()"><code class="function">g_subprocess_launcher_set_environ()</code></a> is called. +Previously, it was copied when the subprocess was executed. This means the +copied environment may now be modified (using <a class="link" href="GSubprocessLauncher.html#g-subprocess-launcher-setenv" title="g_subprocess_launcher_setenv ()"><code class="function">g_subprocess_launcher_setenv()</code></a>, +etc.) before launching the subprocess.</p> <p>On UNIX, all strings in this array can be arbitrary byte strings. On Windows, they should be in UTF-8.</p> <div class="refsect3"> diff --git a/docs/reference/gio/html/gio-D-Bus-Introspection-Data.html b/docs/reference/gio/html/gio-D-Bus-Introspection-Data.html index 7aadec241..4c92ed0cd 100644 --- a/docs/reference/gio/html/gio-D-Bus-Introspection-Data.html +++ b/docs/reference/gio/html/gio-D-Bus-Introspection-Data.html @@ -581,8 +581,8 @@ method.</p> </tr> <tr> <td class="parameter_name"><p>string_builder</p></td> -<td class="parameter_description"><p> A <a href="../glib-Strings.html#GString"><span class="type">GString</span></a> to to append XML data to. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_description"><p>A <a href="../glib-Strings.html#GString"><span class="type">GString</span></a> to to append XML data to.</p></td> +<td class="parameter_annotations"> </td> </tr> </tbody> </table></div> @@ -703,8 +703,8 @@ handling the <code class="literal">org.freedesktop.DBus.Introspectable.Introspec </tr> <tr> <td class="parameter_name"><p>string_builder</p></td> -<td class="parameter_description"><p> A <a href="../glib-Strings.html#GString"><span class="type">GString</span></a> to to append XML data to. </p></td> -<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> +<td class="parameter_description"><p>A <a href="../glib-Strings.html#GString"><span class="type">GString</span></a> to to append XML data to.</p></td> +<td class="parameter_annotations"> </td> </tr> </tbody> </table></div> diff --git a/docs/reference/gio/html/index.html b/docs/reference/gio/html/index.html index cd79975a9..4ae352ab4 100644 --- a/docs/reference/gio/html/index.html +++ b/docs/reference/gio/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GIO Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GIO 2.53.2 + for GIO 2.53.3 The latest version of this documentation can be found on-line at <a class="ulink" href="https://developer.gnome.org/gio/unstable/" target="_top">https://developer.gnome.org/gio/unstable/</a>. diff --git a/docs/reference/gio/version.xml b/docs/reference/gio/version.xml index f3a3607f9..27b2061b6 100644 --- a/docs/reference/gio/version.xml +++ b/docs/reference/gio/version.xml @@ -1 +1 @@ -2.53.2 +2.53.3 diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml index 5033a6015..93639b1f5 100644 --- a/docs/reference/glib/glib-docs.xml +++ b/docs/reference/glib/glib-docs.xml @@ -20,7 +20,7 @@ GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a mainloop abstraction, and so on. It works on many UNIX-like platforms, - as well as Windows and OS X. GLib is released under the GNU Library + as well as Windows and OS X. GLib is released under the GNU Lesser General Public License (GNU LGPL). </para> diff --git a/docs/reference/glib/glib-gettextize.1 b/docs/reference/glib/glib-gettextize.1 index 460e28af6..186497fc0 100644 --- a/docs/reference/glib/glib-gettextize.1 +++ b/docs/reference/glib/glib-gettextize.1 @@ -2,7 +2,7 @@ .\" Title: glib-gettextize .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/gtester-report.1 b/docs/reference/glib/gtester-report.1 index 07e7e6888..469cbc676 100644 --- a/docs/reference/glib/gtester-report.1 +++ b/docs/reference/glib/gtester-report.1 @@ -2,7 +2,7 @@ .\" Title: gtester-report .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/gtester.1 b/docs/reference/glib/gtester.1 index 3ecffb93c..2fd0e6893 100644 --- a/docs/reference/glib/gtester.1 +++ b/docs/reference/glib/gtester.1 @@ -2,7 +2,7 @@ .\" Title: gtester .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GLib .\" Language: English diff --git a/docs/reference/glib/html/glib-GVariant.html b/docs/reference/glib/html/glib-GVariant.html index e8b98549a..db12f6308 100644 --- a/docs/reference/glib/html/glib-GVariant.html +++ b/docs/reference/glib/html/glib-GVariant.html @@ -5410,7 +5410,7 @@ freeing the <a class="link" href="glib-GVariant.html#GVariantBuilder" title="str <a class="link" href="glib-GVariant.html#GVariantBuilder" title="struct GVariantBuilder"><span class="type">GVariantBuilder</span></a> if you want to abort building the value part-way through. This function need not be called if you call <a class="link" href="glib-GVariant.html#g-variant-builder-end" title="g_variant_builder_end ()"><code class="function">g_variant_builder_end()</code></a> and it also doesn't need to be called on -builders allocated with g_variant_builder_new (see +builders allocated with <a class="link" href="glib-GVariant.html#g-variant-builder-new" title="g_variant_builder_new ()"><code class="function">g_variant_builder_new()</code></a> (see <a class="link" href="glib-GVariant.html#g-variant-builder-unref" title="g_variant_builder_unref ()"><code class="function">g_variant_builder_unref()</code></a> for that).</p> <p>This function leaves the <a class="link" href="glib-GVariant.html#GVariantBuilder" title="struct GVariantBuilder"><span class="type">GVariantBuilder</span></a> structure set to all-zeros. It is valid to call this function on either an initialised diff --git a/docs/reference/glib/html/glib-Message-Logging.html b/docs/reference/glib/html/glib-Message-Logging.html index 3388b82bc..e2629fe28 100644 --- a/docs/reference/glib/html/glib-Message-Logging.html +++ b/docs/reference/glib/html/glib-Message-Logging.html @@ -1164,7 +1164,10 @@ g_log_structured (<em class="parameter"><code>const <a class="link" href="glib-B <p>Log a message with structured data. The message will be passed through to the log writer set by the application using <a class="link" href="glib-Message-Logging.html#g-log-set-writer-func" title="g_log_set_writer_func ()"><code class="function">g_log_set_writer_func()</code></a>. If the message is fatal (i.e. its log level is <a class="link" href="glib-Message-Logging.html#G-LOG-LEVEL-ERROR:CAPS"><code class="literal">G_LOG_LEVEL_ERROR</code></a>), the program will -be aborted at the end of this function.</p> +be aborted at the end of this function. If the log writer returns +<a class="link" href="glib-Message-Logging.html#G-LOG-WRITER-UNHANDLED:CAPS"><code class="literal">G_LOG_WRITER_UNHANDLED</code></a> (failure), no other fallback writers will be tried. +See the documentation for <a class="link" href="glib-Message-Logging.html#GLogWriterFunc" title="GLogWriterFunc ()"><span class="type">GLogWriterFunc</span></a> for information on chaining +writers.</p> <p>The structured data is provided as key–value pairs, where keys are UTF-8 strings, and values are arbitrary pointers — typically pointing to UTF-8 strings, but that is not a requirement. To pass binary (non-nul-terminated) @@ -1416,6 +1419,12 @@ can write arbitrary binary output, as field values may be arbitrary binary.</p> as the <code class="literal">PRIORITY</code> field, but is provided separately for convenience of deciding whether or where to output the log entry.</p> +<p>Writer functions should return <a class="link" href="glib-Message-Logging.html#G-LOG-WRITER-HANDLED:CAPS"><code class="literal">G_LOG_WRITER_HANDLED</code></a> if they handled the log +message successfully or if they deliberately ignored it. If there was an +error handling the message (for example, if the writer function is meant to +send messages to a remote logging server and there is a network error), it +should return <a class="link" href="glib-Message-Logging.html#G-LOG-WRITER-UNHANDLED:CAPS"><code class="literal">G_LOG_WRITER_UNHANDLED</code></a>. This allows writer functions to be +chained and fall back to simpler handlers in case of failure.</p> <div class="refsect3"> <a name="GLogWriterFunc.parameters"></a><h4>Parameters</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> diff --git a/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html b/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html index 5b5553660..8b8ec3c4f 100644 --- a/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html +++ b/docs/reference/glib/html/glib-Miscellaneous-Utility-Functions.html @@ -503,9 +503,11 @@ or when displaying an application's name in the task list.</p> g_get_prgname (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p>Gets the name of the program. This name should not be localized, in contrast to <a class="link" href="glib-Miscellaneous-Utility-Functions.html#g-get-application-name" title="g_get_application_name ()"><code class="function">g_get_application_name()</code></a>.</p> -<p>If you are using GDK or GTK+ the program name is set in <code class="function">gdk_init()</code>, -which is called by <a href="../gtk4/gtk4-General.html#gtk-init"><code class="function">gtk_init()</code></a>. The program name is found by taking -the last component of <em class="parameter"><code>argv</code></em> +<p>If you are using <a href="../gio/GApplication.html#GApplication-struct"><span class="type">GApplication</span></a> the program name is set in +<a href="../gio/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a>. In case of GDK or GTK+ it is set in +<code class="function">gdk_init()</code>, which is called by <a href="../gtk4/gtk4-General.html#gtk-init"><code class="function">gtk_init()</code></a> and the +<span class="type">“startupâ€</span> handler. The program name is found by +taking the last component of <em class="parameter"><code>argv</code></em> [0].</p> <div class="refsect3"> <a name="g-get-prgname.returns"></a><h4>Returns</h4> @@ -520,6 +522,12 @@ to GLib and must not be modified or freed.</p> g_set_prgname (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *prgname</code></em>);</pre> <p>Sets the name of the program. This name should not be localized, in contrast to <a class="link" href="glib-Miscellaneous-Utility-Functions.html#g-set-application-name" title="g_set_application_name ()"><code class="function">g_set_application_name()</code></a>.</p> +<p>If you are using <a href="../gio/GApplication.html#GApplication-struct"><span class="type">GApplication</span></a> the program name is set in +<a href="../gio/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a>. In case of GDK or GTK+ it is set in +<code class="function">gdk_init()</code>, which is called by <a href="../gtk4/gtk4-General.html#gtk-init"><code class="function">gtk_init()</code></a> and the +<span class="type">“startupâ€</span> handler. The program name is found by +taking the last component of <em class="parameter"><code>argv</code></em> +[0].</p> <p>Note that for thread-safety reasons this function can only be called once.</p> <div class="refsect3"> <a name="g-set-prgname.parameters"></a><h4>Parameters</h4> diff --git a/docs/reference/glib/html/glib-Version-Information.html b/docs/reference/glib/html/glib-Version-Information.html index 5f1b75345..c9c36904a 100644 --- a/docs/reference/glib/html/glib-Version-Information.html +++ b/docs/reference/glib/html/glib-Version-Information.html @@ -355,7 +355,7 @@ linked against at application run time.</p> <hr> <div class="refsect2"> <a name="GLIB-MICRO-VERSION:CAPS"></a><h3>GLIB_MICRO_VERSION</h3> -<pre class="programlisting">#define GLIB_MICRO_VERSION 2 +<pre class="programlisting">#define GLIB_MICRO_VERSION 3 </pre> <p>The micro version number of the GLib library.</p> <p>Like <span class="type">gtk_micro_version</span>, but from the headers used at diff --git a/docs/reference/glib/html/glib.html b/docs/reference/glib/html/glib.html index cd563afa4..4ee12b31b 100644 --- a/docs/reference/glib/html/glib.html +++ b/docs/reference/glib/html/glib.html @@ -61,7 +61,7 @@ Getting help with GLib GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a mainloop abstraction, and so on. It works on many UNIX-like platforms, - as well as Windows and OS X. GLib is released under the GNU Library + as well as Windows and OS X. GLib is released under the GNU Lesser General Public License (GNU LGPL). </p> </div> diff --git a/docs/reference/glib/html/index.html b/docs/reference/glib/html/index.html index f6f61fda1..180801ecd 100644 --- a/docs/reference/glib/html/index.html +++ b/docs/reference/glib/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GLib Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GLib 2.53.2 + for GLib 2.53.3 The latest version of this documentation can be found on-line at <a class="ulink" href="https://developer.gnome.org/glib/unstable/" target="_top">https://developer.gnome.org/glib/unstable/</a>. diff --git a/docs/reference/glib/version.xml b/docs/reference/glib/version.xml index f3a3607f9..27b2061b6 100644 --- a/docs/reference/glib/version.xml +++ b/docs/reference/glib/version.xml @@ -1 +1 @@ -2.53.2 +2.53.3 diff --git a/docs/reference/gobject/glib-genmarshal.1 b/docs/reference/gobject/glib-genmarshal.1 index 49963a36e..f85532e84 100644 --- a/docs/reference/gobject/glib-genmarshal.1 +++ b/docs/reference/gobject/glib-genmarshal.1 @@ -2,7 +2,7 @@ .\" Title: glib-genmarshal .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/glib-mkenums.1 b/docs/reference/gobject/glib-mkenums.1 index 532ac78c0..626ce0342 100644 --- a/docs/reference/gobject/glib-mkenums.1 +++ b/docs/reference/gobject/glib-mkenums.1 @@ -2,7 +2,7 @@ .\" Title: glib-mkenums .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/gobject-query.1 b/docs/reference/gobject/gobject-query.1 index b6681f199..2592776b3 100644 --- a/docs/reference/gobject/gobject-query.1 +++ b/docs/reference/gobject/gobject-query.1 @@ -2,7 +2,7 @@ .\" Title: gobject-query .\" Author: Tim Janik .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 05/22/2017 +.\" Date: 06/19/2017 .\" Manual: User Commands .\" Source: GObject .\" Language: English diff --git a/docs/reference/gobject/html/index.html b/docs/reference/gobject/html/index.html index 5b5c9061e..a94ff8c36 100644 --- a/docs/reference/gobject/html/index.html +++ b/docs/reference/gobject/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GObject 2.53.2 + for GObject 2.53.3 The latest version of this documentation can be found on-line at <a class="ulink" href="https://developer.gnome.org/gobject/unstable/" target="_top">https://developer.gnome.org/gobject/unstable/</a>. diff --git a/docs/reference/gobject/version.xml b/docs/reference/gobject/version.xml index f3a3607f9..27b2061b6 100644 --- a/docs/reference/gobject/version.xml +++ b/docs/reference/gobject/version.xml @@ -1 +1 @@ -2.53.2 +2.53.3 diff --git a/gio/Makefile.am b/gio/Makefile.am index 67db1b740..f07c94ab5 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -281,6 +281,8 @@ unix_sources = \ gportalnotificationbackend.c \ gdocumentportal.c \ gdocumentportal.h \ + gopenuriportal.c \ + gopenuriportal.h \ gportalsupport.c \ gportalsupport.h \ $(portal_sources) \ @@ -368,6 +370,7 @@ CLEANFILES += $(xdp_dbus_built_sources) portal_interfaces = \ org.freedesktop.portal.Documents.xml \ + org.freedesktop.portal.OpenURI.xml \ org.freedesktop.portal.NetworkMonitor.xml \ org.freedesktop.portal.ProxyResolver.xml \ $(NULL) @@ -383,6 +386,8 @@ $(xdp_dbus_built_sources) : $(portal_interfaces) --generate-c-code $(builddir)/xdp-dbus \ --annotate "org.freedesktop.portal.Documents.Add()" "org.gtk.GDBus.C.UnixFD" "true" \ --annotate "org.freedesktop.portal.Documents.AddNamed()" "org.gtk.GDBus.C.UnixFD" "true" \ + --annotate "org.freedesktop.portal.Documents.AddFull()" "org.gtk.GDBus.C.UnixFD" "true" \ + --annotate "org.freedesktop.portal.OpenURI.OpenFile()" "org.gtk.GDBus.C.UnixFD" "true" \ $^ portal_sources = \ diff --git a/gio/Makefile.in b/gio/Makefile.in index 5cce2aa92..dd4e458d8 100644 --- a/gio/Makefile.in +++ b/gio/Makefile.in @@ -368,16 +368,17 @@ am__libgio_2_0_la_SOURCES_DIST = gappinfo.c gappinfoprivate.h \ gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \ gcontenttypeprivate.h gfdonotificationbackend.c \ ggtknotificationbackend.c gportalnotificationbackend.c \ - gdocumentportal.c gdocumentportal.h gportalsupport.c \ - gportalsupport.h gnetworkmonitorportal.c \ - gnetworkmonitorportal.h gproxyresolverportal.c \ - gproxyresolverportal.h xdp-dbus.c xdp-dbus.h \ - gcocoanotificationbackend.c gnetworkmonitornetlink.c \ - gnetworkmonitornetlink.h gnetworkmonitornm.c \ - gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \ - gdbus-daemon-generated.c gdbus-daemon-generated.h \ - gwin32registrykey.c gwin32registrykey.h gwin32mount.c \ - gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \ + gdocumentportal.c gdocumentportal.h gopenuriportal.c \ + gopenuriportal.h gportalsupport.c gportalsupport.h \ + gnetworkmonitorportal.c gnetworkmonitorportal.h \ + gproxyresolverportal.c gproxyresolverportal.h xdp-dbus.c \ + xdp-dbus.h gcocoanotificationbackend.c \ + gnetworkmonitornetlink.c gnetworkmonitornetlink.h \ + gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \ + gdbusdaemon.h gdbus-daemon-generated.c \ + gdbus-daemon-generated.h gwin32registrykey.c \ + gwin32registrykey.h gwin32mount.c gwin32mount.h \ + gwin32volumemonitor.c gwin32volumemonitor.h \ gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \ gwin32networking.h gvdb/gvdb-format.h gvdb/gvdb-reader.h \ gvdb/gvdb-reader.c gdelayedsettingsbackend.h \ @@ -556,6 +557,7 @@ am__objects_15 = libgio_2_0_la-gnetworkmonitorportal.lo \ @OS_UNIX_TRUE@ libgio_2_0_la-ggtknotificationbackend.lo \ @OS_UNIX_TRUE@ libgio_2_0_la-gportalnotificationbackend.lo \ @OS_UNIX_TRUE@ libgio_2_0_la-gdocumentportal.lo \ +@OS_UNIX_TRUE@ libgio_2_0_la-gopenuriportal.lo \ @OS_UNIX_TRUE@ libgio_2_0_la-gportalsupport.lo \ @OS_UNIX_TRUE@ $(am__objects_15) $(am__objects_1) \ @OS_UNIX_TRUE@ $(am__objects_16) $(am__objects_17) @@ -1509,7 +1511,8 @@ contenttype_sources = $(am__append_35) $(am__append_37) \ @OS_UNIX_TRUE@ gfdonotificationbackend.c \ @OS_UNIX_TRUE@ ggtknotificationbackend.c \ @OS_UNIX_TRUE@ gportalnotificationbackend.c gdocumentportal.c \ -@OS_UNIX_TRUE@ gdocumentportal.h gportalsupport.c \ +@OS_UNIX_TRUE@ gdocumentportal.h gopenuriportal.c \ +@OS_UNIX_TRUE@ gopenuriportal.h gportalsupport.c \ @OS_UNIX_TRUE@ gportalsupport.h $(portal_sources) $(NULL) \ @OS_UNIX_TRUE@ $(am__append_32) $(am__append_33) @OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio @@ -1568,6 +1571,7 @@ win32_more_sources_for_vcproj = \ xdp_dbus_built_sources = xdp-dbus.c xdp-dbus.h portal_interfaces = \ org.freedesktop.portal.Documents.xml \ + org.freedesktop.portal.OpenURI.xml \ org.freedesktop.portal.NetworkMonitor.xml \ org.freedesktop.portal.ProxyResolver.xml \ $(NULL) @@ -2488,6 +2492,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gnotification.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gnotificationbackend.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gnullsettingsbackend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gopenuriportal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gosxappinfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gosxcontenttype.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-goutputstream.Plo@am__quote@ @@ -3973,6 +3978,13 @@ libgio_2_0_la-gdocumentportal.lo: gdocumentportal.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gdocumentportal.lo `test -f 'gdocumentportal.c' || echo '$(srcdir)/'`gdocumentportal.c +libgio_2_0_la-gopenuriportal.lo: gopenuriportal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gopenuriportal.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gopenuriportal.Tpo -c -o libgio_2_0_la-gopenuriportal.lo `test -f 'gopenuriportal.c' || echo '$(srcdir)/'`gopenuriportal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gopenuriportal.Tpo $(DEPDIR)/libgio_2_0_la-gopenuriportal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gopenuriportal.c' object='libgio_2_0_la-gopenuriportal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gopenuriportal.lo `test -f 'gopenuriportal.c' || echo '$(srcdir)/'`gopenuriportal.c + libgio_2_0_la-gportalsupport.lo: gportalsupport.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gportalsupport.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gportalsupport.Tpo -c -o libgio_2_0_la-gportalsupport.lo `test -f 'gportalsupport.c' || echo '$(srcdir)/'`gportalsupport.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gportalsupport.Tpo $(DEPDIR)/libgio_2_0_la-gportalsupport.Plo @@ -4958,6 +4970,8 @@ $(xdp_dbus_built_sources) : $(portal_interfaces) --generate-c-code $(builddir)/xdp-dbus \ --annotate "org.freedesktop.portal.Documents.Add()" "org.gtk.GDBus.C.UnixFD" "true" \ --annotate "org.freedesktop.portal.Documents.AddNamed()" "org.gtk.GDBus.C.UnixFD" "true" \ + --annotate "org.freedesktop.portal.Documents.AddFull()" "org.gtk.GDBus.C.UnixFD" "true" \ + --annotate "org.freedesktop.portal.OpenURI.OpenFile()" "org.gtk.GDBus.C.UnixFD" "true" \ $^ install-data-local: install-ms-lib diff --git a/gio/data-to-c.pl b/gio/data-to-c.pl index 69f74364e..28c1d71e6 100755 --- a/gio/data-to-c.pl +++ b/gio/data-to-c.pl @@ -5,7 +5,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the licence, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c index 551b3c2d3..d9518a621 100644 --- a/gio/fam/gfamfilemonitor.c +++ b/gio/fam/gfamfilemonitor.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gaction.c b/gio/gaction.c index bc2c934a9..3b63de6c3 100644 --- a/gio/gaction.c +++ b/gio/gaction.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gaction.h b/gio/gaction.h index 1fefd3e05..f9f4b38e7 100644 --- a/gio/gaction.h +++ b/gio/gaction.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c index eef46b4e8..6d361f228 100644 --- a/gio/gactiongroup.c +++ b/gio/gactiongroup.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactiongroup.h b/gio/gactiongroup.h index 647d6acad..bba8a236b 100644 --- a/gio/gactiongroup.h +++ b/gio/gactiongroup.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactiongroupexporter.c b/gio/gactiongroupexporter.c index b68538ce3..17111ffb8 100644 --- a/gio/gactiongroupexporter.c +++ b/gio/gactiongroupexporter.c @@ -2,10 +2,10 @@ * Copyright © 2010 Codethink Limited * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactiongroupexporter.h b/gio/gactiongroupexporter.h index 395f3d2aa..ba28c8954 100644 --- a/gio/gactiongroupexporter.h +++ b/gio/gactiongroupexporter.h @@ -2,10 +2,10 @@ * Copyright © 2010 Codethink Limited * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactionmap.c b/gio/gactionmap.c index 778ca251f..bfcda8df3 100644 --- a/gio/gactionmap.c +++ b/gio/gactionmap.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gactionmap.h b/gio/gactionmap.h index 60c08e368..2a22a2771 100644 --- a/gio/gactionmap.h +++ b/gio/gactionmap.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gappinfo.c b/gio/gappinfo.c index ba5815568..b0c03dda8 100644 --- a/gio/gappinfo.c +++ b/gio/gappinfo.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,15 +32,12 @@ #ifdef G_OS_UNIX #include "gdbusconnection.h" #include "gdbusmessage.h" -#include "gdocumentportal.h" #include "gportalsupport.h" -#endif - -#ifdef G_OS_UNIX -#define FLATPAK_OPENURI_PORTAL_BUS_NAME "org.freedesktop.portal.Desktop" -#define FLATPAK_OPENURI_PORTAL_PATH "/org/freedesktop/portal/desktop" -#define FLATPAK_OPENURI_PORTAL_IFACE "org.freedesktop.portal.OpenURI" -#define FLATPAK_OPENURI_PORTAL_METHOD "OpenURI" +#include "gunixfdlist.h" +#include "gopenuriportal.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #endif /** @@ -687,240 +684,6 @@ g_app_info_should_show (GAppInfo *appinfo) return (* iface->should_show) (appinfo); } -#ifdef G_OS_UNIX -static void -response_received (GDBusConnection *connection, - const char *sender_name, - const char *object_path, - const char *interface_name, - const char *signal_name, - GVariant *parameters, - gpointer user_data) -{ - GTask *task = user_data; - guint32 response; - guint signal_id; - - signal_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (task), "signal-id")); - g_dbus_connection_signal_unsubscribe (connection, signal_id); - - g_variant_get (parameters, "(u@a{sv})", &response, NULL); - - if (response == 0) - g_task_return_boolean (task, TRUE); - else if (response == 1) - g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, "Launch cancelled"); - else - g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Launch failed"); - - g_object_unref (task); -} - -static void -open_uri_done (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GDBusConnection *connection = G_DBUS_CONNECTION (source); - GTask *task = user_data; - GVariant *res; - GError *error = NULL; - const char *path; - guint signal_id; - - res = g_dbus_connection_call_finish (connection, result, &error); - - if (res == NULL) - { - g_task_return_error (task, error); - g_object_unref (task); - return; - } - - g_variant_get (res, "(&o)", &path); - - signal_id = - g_dbus_connection_signal_subscribe (connection, - "org.freedesktop.portal.Desktop", - "org.freedesktop.portal.Request", - "Response", - path, - NULL, - G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE, - response_received, - task, NULL); - - g_object_set_data (G_OBJECT (task), "signal-id", GINT_TO_POINTER (signal_id)); - - g_variant_unref (res); -} - -static char * -real_uri_for_portal (const char *uri, - GAppLaunchContext *context, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data, - GError **error) -{ - GFile *file = NULL; - char *real_uri = NULL; - - file = g_file_new_for_uri (uri); - if (g_file_is_native (file)) - { - real_uri = g_document_portal_add_document (file, error); - g_object_unref (file); - - if (real_uri == NULL) - { - g_task_report_error (context, callback, user_data, NULL, *error); - return NULL; - } - } - else - { - g_object_unref (file); - real_uri = g_strdup (uri); - } - - return real_uri; -} - -static void -launch_default_with_portal_async (const char *uri, - GAppLaunchContext *context, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GDBusConnection *session_bus; - GVariantBuilder opt_builder; - const char *parent_window = NULL; - char *real_uri; - GTask *task; - GAsyncReadyCallback dbus_callback; - GError *error = NULL; - - session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); - if (session_bus == NULL) - { - g_task_report_error (context, callback, user_data, NULL, error); - return; - } - - if (context && context->priv->envp) - parent_window = g_environ_getenv (context->priv->envp, "PARENT_WINDOW_ID"); - - real_uri = real_uri_for_portal (uri, context, cancellable, callback, user_data, &error); - if (real_uri == NULL) - { - g_object_unref (session_bus); - return; - } - - g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT); - - if (callback) - { - task = g_task_new (context, cancellable, callback, user_data); - dbus_callback = open_uri_done; - } - else - { - task = NULL; - dbus_callback = NULL; - } - - g_dbus_connection_call (session_bus, - FLATPAK_OPENURI_PORTAL_BUS_NAME, - FLATPAK_OPENURI_PORTAL_PATH, - FLATPAK_OPENURI_PORTAL_IFACE, - FLATPAK_OPENURI_PORTAL_METHOD, - g_variant_new ("(ss@a{sv})", - parent_window ? parent_window : "", - real_uri, - g_variant_builder_end (&opt_builder)), - NULL, - G_DBUS_CALL_FLAGS_NONE, - G_MAXINT, - cancellable, - dbus_callback, - task); - - g_dbus_connection_flush (session_bus, cancellable, NULL, NULL); - g_object_unref (session_bus); - g_free (real_uri); -} - -static void -launch_default_with_portal_sync (const char *uri, - GAppLaunchContext *context) -{ - GDBusConnection *session_bus; - GVariantBuilder opt_builder; - GVariant *res = NULL; - const char *parent_window = NULL; - char *real_uri; - GError *error = NULL; - - session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); - if (session_bus == NULL) - { - g_task_report_error (context, NULL, NULL, NULL, error); - return; - } - - if (context && context->priv->envp) - parent_window = g_environ_getenv (context->priv->envp, "PARENT_WINDOW_ID"); - - real_uri = real_uri_for_portal (uri, context, NULL, NULL, NULL, &error); - if (real_uri == NULL) - { - g_object_unref (session_bus); - return; - } - - g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT); - - /* Calling the D-Bus method for the OpenURI portal "protects" the logic from - * not ever having the remote method running in case the xdg-desktop-portal - * process is not yet running and the caller quits quickly after the call. - */ - res = g_dbus_connection_call_sync (session_bus, - FLATPAK_OPENURI_PORTAL_BUS_NAME, - FLATPAK_OPENURI_PORTAL_PATH, - FLATPAK_OPENURI_PORTAL_IFACE, - FLATPAK_OPENURI_PORTAL_METHOD, - g_variant_new ("(ss@a{sv})", - parent_window ? parent_window : "", - real_uri, - g_variant_builder_end (&opt_builder)), - NULL, - G_DBUS_CALL_FLAGS_NONE, - G_MAXINT, - NULL, - &error); - if (res == NULL) - g_task_report_error (context, NULL, NULL, NULL, error); - else - g_variant_unref (res); - - g_dbus_connection_flush (session_bus, NULL, NULL, NULL); - g_object_unref (session_bus); - g_free (real_uri); -} - -static gboolean -launch_default_with_portal (const char *uri, - GAppLaunchContext *context, - GError **error) -{ - launch_default_with_portal_sync (uri, context); - return TRUE; -} -#endif - static gboolean launch_default_for_uri (const char *uri, GAppLaunchContext *context, @@ -985,10 +748,16 @@ g_app_info_launch_default_for_uri (const char *uri, #ifdef G_OS_UNIX if (glib_should_use_portal ()) { + const char *parent_window = NULL; + /* Reset any error previously set by launch_default_for_uri */ g_clear_error (error); - return launch_default_with_portal (uri, launch_context, error); + if (launch_context && launch_context->priv->envp) + parent_window = g_environ_getenv (launch_context->priv->envp, "PARENT_WINDOW_ID"); + + return g_openuri_portal_open_uri (uri, parent_window, error); + } #endif @@ -1028,7 +797,12 @@ g_app_info_launch_default_for_uri_async (const char *uri, #ifdef G_OS_UNIX if (!res && glib_should_use_portal ()) { - launch_default_with_portal_async (uri, context, cancellable, callback, user_data); + const char *parent_window = NULL; + + if (context && context->priv->envp) + parent_window = g_environ_getenv (context->priv->envp, "PARENT_WINDOW_ID"); + + g_openuri_portal_open_uri_async (uri, parent_window, cancellable, callback, user_data); return; } #endif @@ -1057,7 +831,11 @@ gboolean g_app_info_launch_default_for_uri_finish (GAsyncResult *result, GError **error) { +#ifdef G_OS_UNIX + return g_openuri_portal_open_uri_finish (result, error); +#else return g_task_propagate_boolean (G_TASK (result), error); +#endif } /** diff --git a/gio/gappinfo.h b/gio/gappinfo.h index 726af62e1..18f012689 100644 --- a/gio/gappinfo.h +++ b/gio/gappinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gappinfoprivate.h b/gio/gappinfoprivate.h index 1f13f8c5c..f8b0f483e 100644 --- a/gio/gappinfoprivate.h +++ b/gio/gappinfoprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gapplication-tool.c b/gio/gapplication-tool.c index ef7182e65..68a742419 100644 --- a/gio/gapplication-tool.c +++ b/gio/gapplication-tool.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gapplication.c b/gio/gapplication.c index e068aef06..c00973d91 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,7 +28,6 @@ #include "gapplicationimpl.h" #include "gactiongroup.h" #include "gactionmap.h" -#include "gmenumodel.h" #include "gsettings.h" #include "gnotification-private.h" #include "gnotificationbackend.h" @@ -225,8 +224,6 @@ struct _GApplicationPrivate gchar *resource_path; GActionGroup *actions; - GMenuModel *app_menu; - GMenuModel *menubar; guint inactivity_timeout_id; guint inactivity_timeout; diff --git a/gio/gapplication.h b/gio/gapplication.h index 7cbbf4ca8..a9d2d281a 100644 --- a/gio/gapplication.h +++ b/gio/gapplication.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c index f2fe02537..b3a99e007 100644 --- a/gio/gapplicationcommandline.c +++ b/gio/gapplicationcommandline.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gapplicationcommandline.h b/gio/gapplicationcommandline.h index ff42d0e90..6610e86bd 100644 --- a/gio/gapplicationcommandline.h +++ b/gio/gapplicationcommandline.h @@ -2,10 +2,10 @@ * * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 94cf6ea26..1cef3171a 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c index 7cf86f1b7..fc2464ace 100644 --- a/gio/gasynchelper.c +++ b/gio/gasynchelper.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasynchelper.h b/gio/gasynchelper.h index 5f7f5a3c0..ded5a2204 100644 --- a/gio/gasynchelper.h +++ b/gio/gasynchelper.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c index 6dde9ef72..c48184353 100644 --- a/gio/gasyncinitable.c +++ b/gio/gasyncinitable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasyncinitable.h b/gio/gasyncinitable.h index 6ae426e0a..8b05a22e7 100644 --- a/gio/gasyncinitable.h +++ b/gio/gasyncinitable.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasyncresult.c b/gio/gasyncresult.c index 929dbe2d2..fafda9a04 100644 --- a/gio/gasyncresult.c +++ b/gio/gasyncresult.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h index a80805f08..7ea9e3978 100644 --- a/gio/gasyncresult.h +++ b/gio/gasyncresult.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index 5aaf72802..f70ccb080 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h index 004aea1b3..19c42147c 100644 --- a/gio/gbufferedinputstream.h +++ b/gio/gbufferedinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbufferedoutputstream.c b/gio/gbufferedoutputstream.c index d6bd52792..8b2bcdc04 100644 --- a/gio/gbufferedoutputstream.c +++ b/gio/gbufferedoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h index cce8f2156..f88f27952 100644 --- a/gio/gbufferedoutputstream.h +++ b/gio/gbufferedoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbytesicon.c b/gio/gbytesicon.c index 8459f42cf..ca78be1be 100644 --- a/gio/gbytesicon.c +++ b/gio/gbytesicon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gbytesicon.h b/gio/gbytesicon.h index 48b7f7b1a..5661044b7 100644 --- a/gio/gbytesicon.h +++ b/gio/gbytesicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcancellable.c b/gio/gcancellable.c index bda7910ec..b875ae7ae 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcancellable.h b/gio/gcancellable.h index fec7382ff..45b9a5a19 100644 --- a/gio/gcancellable.h +++ b/gio/gcancellable.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcharsetconverter.c b/gio/gcharsetconverter.c index 77e5a231e..26aa45461 100644 --- a/gio/gcharsetconverter.c +++ b/gio/gcharsetconverter.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcharsetconverter.h b/gio/gcharsetconverter.h index c929dae1e..610f774d8 100644 --- a/gio/gcharsetconverter.h +++ b/gio/gcharsetconverter.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcocoanotificationbackend.c b/gio/gcocoanotificationbackend.c index 8a78c99af..ae4ad8833 100644 --- a/gio/gcocoanotificationbackend.c +++ b/gio/gcocoanotificationbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontenttype-win32.c b/gio/gcontenttype-win32.c index e50a25fc4..74d1b704c 100644 --- a/gio/gcontenttype-win32.c +++ b/gio/gcontenttype-win32.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index 339fc4e9d..820e54258 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h index 1e5bd4729..d87672dd5 100644 --- a/gio/gcontenttype.h +++ b/gio/gcontenttype.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontenttypeprivate.h b/gio/gcontenttypeprivate.h index 0e084c4a3..768a64798 100644 --- a/gio/gcontenttypeprivate.h +++ b/gio/gcontenttypeprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontextspecificgroup.c b/gio/gcontextspecificgroup.c index 211d76540..ffd1307e4 100644 --- a/gio/gcontextspecificgroup.c +++ b/gio/gcontextspecificgroup.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcontextspecificgroup.h b/gio/gcontextspecificgroup.h index 9c06aa83b..74d22a44e 100644 --- a/gio/gcontextspecificgroup.h +++ b/gio/gcontextspecificgroup.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverter.c b/gio/gconverter.c index 88b22c16b..7e5d30850 100644 --- a/gio/gconverter.c +++ b/gio/gconverter.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverter.h b/gio/gconverter.h index 62bc59275..87164534b 100644 --- a/gio/gconverter.h +++ b/gio/gconverter.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c index 5fb26cbaf..dd84b3474 100644 --- a/gio/gconverterinputstream.c +++ b/gio/gconverterinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverterinputstream.h b/gio/gconverterinputstream.h index 9f6d063a5..48cc10221 100644 --- a/gio/gconverterinputstream.h +++ b/gio/gconverterinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c index eef277eda..00ee641da 100644 --- a/gio/gconverteroutputstream.c +++ b/gio/gconverteroutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gconverteroutputstream.h b/gio/gconverteroutputstream.h index cc7767d0a..b9a1e5d40 100644 --- a/gio/gconverteroutputstream.h +++ b/gio/gconverteroutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcredentials.c b/gio/gcredentials.c index 5be0234aa..2e050776c 100644 --- a/gio/gcredentials.c +++ b/gio/gcredentials.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcredentials.h b/gio/gcredentials.h index 900dfdb93..25cebf2b4 100644 --- a/gio/gcredentials.h +++ b/gio/gcredentials.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gcredentialsprivate.h b/gio/gcredentialsprivate.h index e15627692..4d1c420a8 100644 --- a/gio/gcredentialsprivate.h +++ b/gio/gcredentialsprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdatagrambased.c b/gio/gdatagrambased.c index af3eb63f7..1e1c051df 100644 --- a/gio/gdatagrambased.c +++ b/gio/gdatagrambased.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdatagrambased.h b/gio/gdatagrambased.h index e5d80a0d5..838b485df 100644 --- a/gio/gdatagrambased.h +++ b/gio/gdatagrambased.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index 4c50f357b..348ce4445 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -723,7 +723,7 @@ scan_for_newline (GDataInputStream *stream, /** * g_data_input_stream_read_line: * @stream: a given #GDataInputStream. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * @@ -809,7 +809,7 @@ g_data_input_stream_read_line (GDataInputStream *stream, /** * g_data_input_stream_read_line_utf8: * @stream: a given #GDataInputStream. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * @@ -895,7 +895,7 @@ scan_for_chars (GDataInputStream *stream, * g_data_input_stream_read_until: * @stream: a given #GDataInputStream. * @stop_chars: characters to terminate the read. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore. * @error: #GError for error reporting. * @@ -1191,7 +1191,7 @@ g_data_input_stream_read_until_async (GDataInputStream *stream, * g_data_input_stream_read_line_finish: * @stream: a given #GDataInputStream. * @result: the #GAsyncResult that was provided to the callback. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @error: #GError for error reporting. * * Finish an asynchronous call started by @@ -1223,7 +1223,7 @@ g_data_input_stream_read_line_finish (GDataInputStream *stream, * g_data_input_stream_read_line_finish_utf8: * @stream: a given #GDataInputStream. * @result: the #GAsyncResult that was provided to the callback. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @error: #GError for error reporting. * * Finish an asynchronous call started by @@ -1265,7 +1265,7 @@ g_data_input_stream_read_line_finish_utf8 (GDataInputStream *stream, * g_data_input_stream_read_until_finish: * @stream: a given #GDataInputStream. * @result: the #GAsyncResult that was provided to the callback. - * @length: (out): a #gsize to get the length of the data read in. + * @length: (out) (optional): a #gsize to get the length of the data read in. * @error: #GError for error reporting. * * Finish an asynchronous call started by @@ -1295,7 +1295,7 @@ g_data_input_stream_read_until_finish (GDataInputStream *stream, * @stop_chars: characters to terminate the read * @stop_chars_len: length of @stop_chars. May be -1 if @stop_chars is * nul-terminated - * @length: (out): a #gsize to get the length of the data read in + * @length: (out) (optional): a #gsize to get the length of the data read in * @cancellable: (nullable): optional #GCancellable object, %NULL to ignore * @error: #GError for error reporting * @@ -1430,7 +1430,7 @@ g_data_input_stream_read_upto_async (GDataInputStream *stream, * g_data_input_stream_read_upto_finish: * @stream: a #GDataInputStream * @result: the #GAsyncResult that was provided to the callback - * @length: (out): a #gsize to get the length of the data read in + * @length: (out) (optional): a #gsize to get the length of the data read in * @error: #GError for error reporting * * Finish an asynchronous call started by diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h index 8304156e2..c37b7971f 100644 --- a/gio/gdatainputstream.h +++ b/gio/gdatainputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdataoutputstream.c b/gio/gdataoutputstream.c index 960c8da9d..4c2d2519c 100644 --- a/gio/gdataoutputstream.c +++ b/gio/gdataoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h index ebd6a5b88..62cf7b5e3 100644 --- a/gio/gdataoutputstream.h +++ b/gio/gdataoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/__init__.py b/gio/gdbus-2.0/codegen/__init__.py index ed3a5708f..f876f04af 100644 --- a/gio/gdbus-2.0/codegen/__init__.py +++ b/gio/gdbus-2.0/codegen/__init__.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py index f9f404c91..15cf96124 100644 --- a/gio/gdbus-2.0/codegen/codegen.py +++ b/gio/gdbus-2.0/codegen/codegen.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py index 18e3d0016..c727562d9 100644 --- a/gio/gdbus-2.0/codegen/codegen_docbook.py +++ b/gio/gdbus-2.0/codegen/codegen_docbook.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,6 +21,7 @@ import sys import re +from os import path from . import config from . import utils @@ -30,9 +31,10 @@ from . import parser # ---------------------------------------------------------------------------------------------------- class DocbookCodeGenerator: - def __init__(self, ifaces, docbook): + def __init__(self, ifaces, docbook, outdir): self.ifaces = ifaces self.docbook = docbook + self.outdir = outdir self.generate_expand_dicts() def print_method_prototype(self, i, m, in_synopsis): @@ -270,7 +272,7 @@ class DocbookCodeGenerator: def generate(self): for i in self.ifaces: - self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w') + self.out = open(path.join(self.outdir, '%s-%s.xml'%(self.docbook, i.name)), 'w') self.out.write(''%()) self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%()) self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%()) diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py index 57254008d..0f26f11be 100755 --- a/gio/gdbus-2.0/codegen/codegen_main.py +++ b/gio/gdbus-2.0/codegen/codegen_main.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -181,14 +181,15 @@ def codegen_main(): for i in all_ifaces: i.post_process(opts.interface_prefix, opts.c_namespace) + outdir = opts.output_directory + docbook = opts.generate_docbook - docbook_gen = codegen_docbook.DocbookCodeGenerator(all_ifaces, docbook); + docbook_gen = codegen_docbook.DocbookCodeGenerator(all_ifaces, docbook, outdir); if docbook: ret = docbook_gen.generate() c_code = opts.generate_c_code if c_code: - outdir = opts.output_directory header_name = c_code + '.h' h = open(path.join(outdir, header_name), 'w') c = open(path.join(outdir, c_code + '.c'), 'w') diff --git a/gio/gdbus-2.0/codegen/config.py b/gio/gdbus-2.0/codegen/config.py index a95454e11..04e3e5f56 100644 --- a/gio/gdbus-2.0/codegen/config.py +++ b/gio/gdbus-2.0/codegen/config.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,4 +22,4 @@ DATADIR = "${prefix}/share" DATADIR = DATADIR.replace( "${prefix}", "/home/mclasen/gnome") -VERSION = "2.53.2" +VERSION = "2.53.3" diff --git a/gio/gdbus-2.0/codegen/config.py.in b/gio/gdbus-2.0/codegen/config.py.in index 38e08652c..80d20ee78 100644 --- a/gio/gdbus-2.0/codegen/config.py.in +++ b/gio/gdbus-2.0/codegen/config.py.in @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/dbustypes.py b/gio/gdbus-2.0/codegen/dbustypes.py index 8787c929c..b163cb935 100644 --- a/gio/gdbus-2.0/codegen/dbustypes.py +++ b/gio/gdbus-2.0/codegen/dbustypes.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in index fd31a55b7..9c086fe87 100644 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py index 90cebd961..df8f84593 100644 --- a/gio/gdbus-2.0/codegen/parser.py +++ b/gio/gdbus-2.0/codegen/parser.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py index 2c01493dc..39e046351 100644 --- a/gio/gdbus-2.0/codegen/utils.py +++ b/gio/gdbus-2.0/codegen/utils.py @@ -7,7 +7,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbus-daemon-generated.c b/gio/gdbus-daemon-generated.c index 1224bed30..c1544f832 100644 --- a/gio/gdbus-daemon-generated.c +++ b/gio/gdbus-daemon-generated.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.2. DO NOT EDIT. + * Generated by gdbus-codegen 2.53.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/gio/gdbus-daemon-generated.h b/gio/gdbus-daemon-generated.h index f2ca8a130..07eb57654 100644 --- a/gio/gdbus-daemon-generated.h +++ b/gio/gdbus-daemon-generated.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.2. DO NOT EDIT. + * Generated by gdbus-codegen 2.53.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c index c433e30b3..fb285f1db 100644 --- a/gio/gdbus-tool.c +++ b/gio/gdbus-tool.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusactiongroup-private.h b/gio/gdbusactiongroup-private.h index 648201435..b46df2277 100644 --- a/gio/gdbusactiongroup-private.h +++ b/gio/gdbusactiongroup-private.h @@ -2,10 +2,10 @@ * Copyright © 2010 Codethink Limited * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c index d10052c72..0acee36a9 100644 --- a/gio/gdbusactiongroup.c +++ b/gio/gdbusactiongroup.c @@ -2,10 +2,10 @@ * Copyright © 2010 Codethink Limited * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h index 9407d822a..93e6a2cfe 100644 --- a/gio/gdbusactiongroup.h +++ b/gio/gdbusactiongroup.h @@ -2,10 +2,10 @@ * Copyright © 2010 Codethink Limited * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c index 9b3619cb1..f4fb41d64 100644 --- a/gio/gdbusaddress.c +++ b/gio/gdbusaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusaddress.h b/gio/gdbusaddress.h index fb6283667..43915bb8d 100644 --- a/gio/gdbusaddress.h +++ b/gio/gdbusaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c index a4458b242..e46e62260 100644 --- a/gio/gdbusauth.c +++ b/gio/gdbusauth.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauth.h b/gio/gdbusauth.h index 8fd16ddff..2b4652bea 100644 --- a/gio/gdbusauth.h +++ b/gio/gdbusauth.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanism.c b/gio/gdbusauthmechanism.c index d00fc4c55..897d41496 100644 --- a/gio/gdbusauthmechanism.c +++ b/gio/gdbusauthmechanism.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanism.h b/gio/gdbusauthmechanism.h index f40aa99bc..cee87b0a2 100644 --- a/gio/gdbusauthmechanism.h +++ b/gio/gdbusauthmechanism.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismanon.c b/gio/gdbusauthmechanismanon.c index f7c9917cd..a166ede01 100644 --- a/gio/gdbusauthmechanismanon.c +++ b/gio/gdbusauthmechanismanon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismanon.h b/gio/gdbusauthmechanismanon.h index 844f07c56..2968159a1 100644 --- a/gio/gdbusauthmechanismanon.h +++ b/gio/gdbusauthmechanismanon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismexternal.c b/gio/gdbusauthmechanismexternal.c index c456ce2b6..a4473a443 100644 --- a/gio/gdbusauthmechanismexternal.c +++ b/gio/gdbusauthmechanismexternal.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismexternal.h b/gio/gdbusauthmechanismexternal.h index eb065ff32..4408db9c5 100644 --- a/gio/gdbusauthmechanismexternal.h +++ b/gio/gdbusauthmechanismexternal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c index 0aa5c2516..d4ebe354e 100644 --- a/gio/gdbusauthmechanismsha1.c +++ b/gio/gdbusauthmechanismsha1.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthmechanismsha1.h b/gio/gdbusauthmechanismsha1.h index 95dcf84fc..0e563fd2c 100644 --- a/gio/gdbusauthmechanismsha1.h +++ b/gio/gdbusauthmechanismsha1.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c index dce5c2a3e..34758aa20 100644 --- a/gio/gdbusauthobserver.c +++ b/gio/gdbusauthobserver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusauthobserver.h b/gio/gdbusauthobserver.h index 5e78976cb..8fe7b3292 100644 --- a/gio/gdbusauthobserver.h +++ b/gio/gdbusauthobserver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 826341950..15146dc0a 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h index 7aa125689..b0219e966 100644 --- a/gio/gdbusconnection.h +++ b/gio/gdbusconnection.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c index dd7ab21e5..c41c2039d 100644 --- a/gio/gdbuserror.c +++ b/gio/gdbuserror.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h index c6bc75473..f30c7e187 100644 --- a/gio/gdbuserror.h +++ b/gio/gdbuserror.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusinterface.c b/gio/gdbusinterface.c index 65eb4e002..fa03115d2 100644 --- a/gio/gdbusinterface.c +++ b/gio/gdbusinterface.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusinterface.h b/gio/gdbusinterface.h index d6316b3cc..b2f3c4405 100644 --- a/gio/gdbusinterface.h +++ b/gio/gdbusinterface.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c index b96be3ff8..357e95146 100644 --- a/gio/gdbusinterfaceskeleton.c +++ b/gio/gdbusinterfaceskeleton.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusinterfaceskeleton.h b/gio/gdbusinterfaceskeleton.h index 45307fe12..bf3b630e4 100644 --- a/gio/gdbusinterfaceskeleton.h +++ b/gio/gdbusinterfaceskeleton.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c index 778930175..e9601dbbd 100644 --- a/gio/gdbusintrospection.c +++ b/gio/gdbusintrospection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -776,7 +776,7 @@ g_dbus_property_info_generate_xml (GDBusPropertyInfo *info, * g_dbus_interface_info_generate_xml: * @info: A #GDBusNodeInfo * @indent: Indentation level. - * @string_builder: (out): A #GString to to append XML data to. + * @string_builder: A #GString to to append XML data to. * * Appends an XML representation of @info (and its children) to @string_builder. * @@ -825,7 +825,7 @@ g_dbus_interface_info_generate_xml (GDBusInterfaceInfo *info, * g_dbus_node_info_generate_xml: * @info: A #GDBusNodeInfo. * @indent: Indentation level. - * @string_builder: (out): A #GString to to append XML data to. + * @string_builder: A #GString to to append XML data to. * * Appends an XML representation of @info (and its children) to @string_builder. * diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h index edaf63e60..14b171055 100644 --- a/gio/gdbusintrospection.h +++ b/gio/gdbusintrospection.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmenumodel.c b/gio/gdbusmenumodel.c index aafc9aeb1..9593d97f6 100644 --- a/gio/gdbusmenumodel.c +++ b/gio/gdbusmenumodel.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmenumodel.h b/gio/gdbusmenumodel.h index 05ae93bc5..dd2882d22 100644 --- a/gio/gdbusmenumodel.h +++ b/gio/gdbusmenumodel.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index 6f62afb94..ce655ed53 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h index bd3e8e980..5f039dc91 100644 --- a/gio/gdbusmessage.h +++ b/gio/gdbusmessage.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index 69dc435d1..fe2820349 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h index 6354e4102..061256ffe 100644 --- a/gio/gdbusmethodinvocation.h +++ b/gio/gdbusmethodinvocation.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c index c95e43490..d40f9346d 100644 --- a/gio/gdbusnameowning.c +++ b/gio/gdbusnameowning.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusnameowning.h b/gio/gdbusnameowning.h index a9cedcb4e..89c011a2f 100644 --- a/gio/gdbusnameowning.h +++ b/gio/gdbusnameowning.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c index 14603c5e4..9fb6dd1ca 100644 --- a/gio/gdbusnamewatching.c +++ b/gio/gdbusnamewatching.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -249,13 +249,43 @@ call_vanished_handler (Client *client, /* ---------------------------------------------------------------------------------------------------- */ +/* Return a reference to the #Client for @watcher_id, or %NULL if it’s been + * unwatched. This is safe to call from any thread. */ +static Client * +dup_client (guint watcher_id) +{ + Client *client; + + G_LOCK (lock); + + g_assert (watcher_id != 0); + g_assert (map_id_to_client != NULL); + + client = g_hash_table_lookup (map_id_to_client, GUINT_TO_POINTER (watcher_id)); + + if (client != NULL) + client_ref (client); + + G_UNLOCK (lock); + + return client; +} + +/* Could be called from any thread, so it could be called after client_unref() + * has started finalising the #Client. Avoid that by looking up the #Client + * atomically. */ static void on_connection_disconnected (GDBusConnection *connection, gboolean remote_peer_vanished, GError *error, gpointer user_data) { - Client *client = user_data; + guint watcher_id = GPOINTER_TO_UINT (user_data); + Client *client = NULL; + + client = dup_client (watcher_id); + if (client == NULL) + return; if (client->name_owner_changed_subscription_id > 0) g_dbus_connection_signal_unsubscribe (client->connection, client->name_owner_changed_subscription_id); @@ -267,10 +297,13 @@ on_connection_disconnected (GDBusConnection *connection, client->connection = NULL; call_vanished_handler (client, FALSE); + + client_unref (client); } /* ---------------------------------------------------------------------------------------------------- */ +/* Will always be called from the thread which acquired client->main_context. */ static void on_name_owner_changed (GDBusConnection *connection, const gchar *sender_name, @@ -280,11 +313,16 @@ on_name_owner_changed (GDBusConnection *connection, GVariant *parameters, gpointer user_data) { - Client *client = user_data; + guint watcher_id = GPOINTER_TO_UINT (user_data); + Client *client = NULL; const gchar *name; const gchar *old_owner; const gchar *new_owner; + client = dup_client (watcher_id); + if (client == NULL) + return; + if (!client->initialized) goto out; @@ -319,7 +357,7 @@ on_name_owner_changed (GDBusConnection *connection, } out: - ; + client_unref (client); } /* ---------------------------------------------------------------------------------------------------- */ @@ -444,7 +482,7 @@ has_connection (Client *client) client->disconnected_signal_handler_id = g_signal_connect (client->connection, "closed", G_CALLBACK (on_connection_disconnected), - client); + GUINT_TO_POINTER (client->id)); /* start listening to NameOwnerChanged messages immediately */ client->name_owner_changed_subscription_id = g_dbus_connection_signal_subscribe (client->connection, @@ -455,7 +493,7 @@ has_connection (Client *client) client->name, G_DBUS_SIGNAL_FLAGS_NONE, on_name_owner_changed, - client, + GUINT_TO_POINTER (client->id), NULL); if (client->flags & G_BUS_NAME_WATCHER_FLAGS_AUTO_START) diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h index bdc7d3264..d803ecb5d 100644 --- a/gio/gdbusnamewatching.h +++ b/gio/gdbusnamewatching.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobject.c b/gio/gdbusobject.c index e1dd2204f..3c52a6a84 100644 --- a/gio/gdbusobject.c +++ b/gio/gdbusobject.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobject.h b/gio/gdbusobject.h index b408e2e0a..157c52b1a 100644 --- a/gio/gdbusobject.h +++ b/gio/gdbusobject.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanager.c b/gio/gdbusobjectmanager.c index d899c00cc..0eaec3f8c 100644 --- a/gio/gdbusobjectmanager.c +++ b/gio/gdbusobjectmanager.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanager.h b/gio/gdbusobjectmanager.h index 0ba8671ae..260ae2ee6 100644 --- a/gio/gdbusobjectmanager.h +++ b/gio/gdbusobjectmanager.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index 24327bf7f..17a515a37 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanagerclient.h b/gio/gdbusobjectmanagerclient.h index e7986b6ef..eafabfbf1 100644 --- a/gio/gdbusobjectmanagerclient.h +++ b/gio/gdbusobjectmanagerclient.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index 31bfa8599..d8781ed20 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectmanagerserver.h b/gio/gdbusobjectmanagerserver.h index 6debf595b..dd725b737 100644 --- a/gio/gdbusobjectmanagerserver.h +++ b/gio/gdbusobjectmanagerserver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectproxy.c b/gio/gdbusobjectproxy.c index 97889251e..ae87b428c 100644 --- a/gio/gdbusobjectproxy.c +++ b/gio/gdbusobjectproxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectproxy.h b/gio/gdbusobjectproxy.h index 147cde923..38c8d5118 100644 --- a/gio/gdbusobjectproxy.h +++ b/gio/gdbusobjectproxy.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectskeleton.c b/gio/gdbusobjectskeleton.c index f740975de..c0e56110a 100644 --- a/gio/gdbusobjectskeleton.c +++ b/gio/gdbusobjectskeleton.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusobjectskeleton.h b/gio/gdbusobjectskeleton.h index 075b92b80..fe6952f5a 100644 --- a/gio/gdbusobjectskeleton.h +++ b/gio/gdbusobjectskeleton.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index d0bc23328..288c31f40 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +24,9 @@ #include <string.h> #include "giotypes.h" +#include "gioenumtypes.h" #include "gsocket.h" +#include "gdbusauthobserver.h" #include "gdbusprivate.h" #include "gdbusmessage.h" #include "gdbusconnection.h" @@ -36,6 +38,7 @@ #include "gmemoryinputstream.h" #include "giostream.h" #include "glib/gstdio.h" +#include "gsocketaddress.h" #include "gsocketcontrolmessage.h" #include "gsocketconnection.h" #include "gsocketoutputstream.h" diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h index b1f4890bf..6a6a08014 100644 --- a/gio/gdbusprivate.h +++ b/gio/gdbusprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c index 96c761bb1..14f484096 100644 --- a/gio/gdbusproxy.c +++ b/gio/gdbusproxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusproxy.h b/gio/gdbusproxy.h index 3dbe9cf93..6be9871ec 100644 --- a/gio/gdbusproxy.h +++ b/gio/gdbusproxy.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index 580afe275..bb1b9e2b2 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusserver.h b/gio/gdbusserver.h index f0beb8535..123eac4da 100644 --- a/gio/gdbusserver.h +++ b/gio/gdbusserver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c index 4e177491c..df0b3f545 100644 --- a/gio/gdbusutils.c +++ b/gio/gdbusutils.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h index fa64426f8..5aecb5142 100644 --- a/gio/gdbusutils.h +++ b/gio/gdbusutils.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdelayedsettingsbackend.c b/gio/gdelayedsettingsbackend.c index 22a42ebda..e41393f8e 100644 --- a/gio/gdelayedsettingsbackend.c +++ b/gio/gdelayedsettingsbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdelayedsettingsbackend.h b/gio/gdelayedsettingsbackend.h index 1f3c8f062..1eb890ab7 100644 --- a/gio/gdelayedsettingsbackend.h +++ b/gio/gdelayedsettingsbackend.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 81dff27c9..e9fa038c3 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -48,6 +48,10 @@ #include "gappinfoprivate.h" #include "glocalfilemonitor.h" +#ifdef G_OS_UNIX +#include "gdocumentportal.h" +#endif + /** * SECTION:gdesktopappinfo * @title: GDesktopAppInfo @@ -2835,17 +2839,15 @@ g_desktop_app_info_make_platform_data (GDesktopAppInfo *info, return g_variant_builder_end (&builder); } -static gboolean -g_desktop_app_info_launch_uris_with_dbus (GDesktopAppInfo *info, - GDBusConnection *session_bus, - GList *uris, - GAppLaunchContext *launch_context) +static void +launch_uris_with_dbus (GDesktopAppInfo *info, + GDBusConnection *session_bus, + GList *uris, + GAppLaunchContext *launch_context) { GVariantBuilder builder; gchar *object_path; - g_return_val_if_fail (info != NULL, FALSE); - g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE); if (uris) @@ -2869,6 +2871,33 @@ g_desktop_app_info_launch_uris_with_dbus (GDesktopAppInfo *info, uris ? "Open" : "Activate", g_variant_builder_end (&builder), NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL); g_free (object_path); +} + +static gboolean +g_desktop_app_info_launch_uris_with_dbus (GDesktopAppInfo *info, + GDBusConnection *session_bus, + GList *uris, + GAppLaunchContext *launch_context) +{ + GList *ruris = uris; + g_autofree char *app_id = NULL; + + g_return_val_if_fail (info != NULL, FALSE); + +#ifdef G_OS_UNIX + app_id = g_desktop_app_info_get_string (info, "X-Flatpak"); + if (app_id && *app_id) + { + ruris = g_document_portal_add_documents (uris, app_id, NULL); + if (ruris == NULL) + ruris = uris; + } +#endif + + launch_uris_with_dbus (info, session_bus, ruris, launch_context); + + if (ruris != uris) + g_list_free_full (ruris, g_free); return TRUE; } diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h index 97cbe3909..7be940bdd 100644 --- a/gio/gdesktopappinfo.h +++ b/gio/gdesktopappinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdocumentportal.c b/gio/gdocumentportal.c index 7522d0b4d..e5d61ab86 100644 --- a/gio/gdocumentportal.c +++ b/gio/gdocumentportal.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,6 +21,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> +#include <string.h> #include "gdocumentportal.h" #include "xdp-dbus.h" @@ -105,7 +106,7 @@ g_document_portal_add_document (GFile *file, if (!init_document_portal ()) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_INITIALIZED, "Document portal is not available"); goto out; } @@ -159,3 +160,126 @@ g_document_portal_add_document (GFile *file, return doc_uri; } + +/* Flags accepted by org.freedesktop.portal.Documents.AddFull */ +enum { + XDP_ADD_FLAGS_REUSE_EXISTING = (1 << 0), + XDP_ADD_FLAGS_PERSISTENT = (1 << 1), + XDP_ADD_FLAGS_AS_NEEDED_BY_APP = (1 << 2), + XDP_ADD_FLAGS_FLAGS_ALL = ((1 << 3) - 1) +}; + +GList * +g_document_portal_add_documents (GList *uris, + const char *app_id, + GError **error) +{ + int length; + GList *ruris = NULL; + gboolean *as_is; + GVariantBuilder builder; + GUnixFDList *fd_list = NULL; + GList *l; + gsize i, j; + const char *permissions[] = { "read", "write", NULL }; + char **doc_ids = NULL; + GVariant *extra_out = NULL; + + if (!init_document_portal ()) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_INITIALIZED, + "Document portal is not available"); + return NULL; + } + + length = g_list_length (uris); + as_is = g_new0 (gboolean, length); + + g_variant_builder_init (&builder, G_VARIANT_TYPE ("ah")); + + fd_list = g_unix_fd_list_new (); + for (l = uris, i = 0; l; l = l->next, i++) + { + const char *uri = l->data; + int idx = -1; + g_autofree char *path = NULL; + + path = g_filename_from_uri (uri, NULL, NULL); + if (path != NULL) + { + int fd; + + fd = g_open (path, O_CLOEXEC | O_PATH); + if (fd >= 0) + { +#ifndef HAVE_O_CLOEXEC + fcntl (fd, F_SETFD, FD_CLOEXEC); +#endif + idx = g_unix_fd_list_append (fd_list, fd, NULL); + close (fd); + } + } + + if (idx != -1) + g_variant_builder_add (&builder, "h", idx); + else + as_is[i] = TRUE; + } + + if (g_unix_fd_list_get_length (fd_list) > 0) + { + if (!gxdp_documents_call_add_full_sync (documents, + g_variant_builder_end (&builder), + XDP_ADD_FLAGS_AS_NEEDED_BY_APP, + app_id, + permissions, + fd_list, + &doc_ids, + &extra_out, + NULL, + NULL, + error)) + goto out; + + for (l = uris, i = 0, j = 0; l; l = l->next, i++) + { + const char *uri = l->data; + char *ruri; + + if (as_is[i]) /* use as-is, not a file uri */ + { + ruri = g_strdup (uri); + } + else if (strcmp (doc_ids[j], "") == 0) /* not rewritten */ + { + ruri = g_strdup (uri); + j++; + } + else + { + char *basename = g_path_get_basename (uri + strlen ("file:")); + char *doc_path = g_build_filename (documents_mountpoint, doc_ids[j], basename, NULL); + ruri = g_strconcat ("file:", doc_path, NULL); + g_free (basename); + g_free (doc_path); + j++; + } + + ruris = g_list_prepend (ruris, ruri); + } + + ruris = g_list_reverse (ruris); + } + else + { + ruris = g_list_copy_deep (uris, (GCopyFunc)g_strdup, NULL); + } + +out: + g_clear_object (&fd_list); + g_clear_pointer (&extra_out, g_variant_unref); + g_clear_pointer (&doc_ids, g_strfreev); + g_free (as_is); + + return ruris; +} diff --git a/gio/gdocumentportal.h b/gio/gdocumentportal.h index 720768c18..adb1b974e 100644 --- a/gio/gdocumentportal.h +++ b/gio/gdocumentportal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,6 +26,10 @@ G_BEGIN_DECLS char * g_document_portal_add_document (GFile *file, GError **error); +GList * g_document_portal_add_documents (GList *uris, + const char *app_id, + GError **error); + G_END_DECLS #endif diff --git a/gio/gdrive.c b/gio/gdrive.c index 9720bf426..bd42691d9 100644 --- a/gio/gdrive.c +++ b/gio/gdrive.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdrive.h b/gio/gdrive.h index 67df80eb9..a33704219 100644 --- a/gio/gdrive.h +++ b/gio/gdrive.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsclientconnection.c b/gio/gdtlsclientconnection.c index 5e992d25d..1ce97d362 100644 --- a/gio/gdtlsclientconnection.c +++ b/gio/gdtlsclientconnection.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsclientconnection.h b/gio/gdtlsclientconnection.h index 3296b5981..daf8e54ff 100644 --- a/gio/gdtlsclientconnection.h +++ b/gio/gdtlsclientconnection.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c index b712d9126..67a038d18 100644 --- a/gio/gdtlsconnection.c +++ b/gio/gdtlsconnection.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsconnection.h b/gio/gdtlsconnection.h index 835015ce7..207b6dfde 100644 --- a/gio/gdtlsconnection.h +++ b/gio/gdtlsconnection.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsserverconnection.c b/gio/gdtlsserverconnection.c index 93ee7d701..51074e222 100644 --- a/gio/gdtlsserverconnection.c +++ b/gio/gdtlsserverconnection.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdtlsserverconnection.h b/gio/gdtlsserverconnection.h index 3082d2691..24ecb76c4 100644 --- a/gio/gdtlsserverconnection.h +++ b/gio/gdtlsserverconnection.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummyfile.c b/gio/gdummyfile.c index 4ac3bd9b3..cd4acd021 100644 --- a/gio/gdummyfile.c +++ b/gio/gdummyfile.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummyfile.h b/gio/gdummyfile.h index 580daf96c..57f058de8 100644 --- a/gio/gdummyfile.h +++ b/gio/gdummyfile.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummyproxyresolver.c b/gio/gdummyproxyresolver.c index eddd60a6c..893f97d25 100644 --- a/gio/gdummyproxyresolver.c +++ b/gio/gdummyproxyresolver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummyproxyresolver.h b/gio/gdummyproxyresolver.h index 040e81b8c..1f782bc38 100644 --- a/gio/gdummyproxyresolver.h +++ b/gio/gdummyproxyresolver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummytlsbackend.c b/gio/gdummytlsbackend.c index ff8ff2ee7..52342d957 100644 --- a/gio/gdummytlsbackend.c +++ b/gio/gdummytlsbackend.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gdummytlsbackend.h b/gio/gdummytlsbackend.h index b9699c7a1..08e8f07a0 100644 --- a/gio/gdummytlsbackend.h +++ b/gio/gdummytlsbackend.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gemblem.c b/gio/gemblem.c index 96304c6e7..e8c4d4e63 100644 --- a/gio/gemblem.c +++ b/gio/gemblem.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gemblem.h b/gio/gemblem.h index bbfbeaa82..094f9cb87 100644 --- a/gio/gemblem.h +++ b/gio/gemblem.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c index cb9087a2b..42d013dfa 100644 --- a/gio/gemblemedicon.c +++ b/gio/gemblemedicon.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gemblemedicon.h b/gio/gemblemedicon.h index 1b1b109e5..3374e0a68 100644 --- a/gio/gemblemedicon.h +++ b/gio/gemblemedicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c index 42613701d..77dcf69e7 100644 --- a/gio/gfdonotificationbackend.c +++ b/gio/gfdonotificationbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfile.c b/gio/gfile.c index af0587bc7..212d3e0ef 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -3402,18 +3402,18 @@ g_file_copy (GFile *source, } /** - * g_file_copy_async: (skip) + * g_file_copy_async: * @source: input #GFile * @destination: destination #GFile * @flags: set of #GFileCopyFlags * @io_priority: the [I/O priority][io-priority] of the request * @cancellable: (nullable): optional #GCancellable object, * %NULL to ignore - * @progress_callback: (nullable): function to callback with progress + * @progress_callback: (nullable) (scope notified): function to callback with progress * information, or %NULL if progress information is not needed - * @progress_callback_data: (closure): user data to pass to @progress_callback - * @callback: a #GAsyncReadyCallback to call when the request is satisfied - * @user_data: the data to pass to callback function + * @progress_callback_data: (closure progress_callback) (nullable): user data to pass to @progress_callback + * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied + * @user_data: (closure callback): the data to pass to callback function * * Copies the file @source to the location specified by @destination * asynchronously. For details of the behaviour, see g_file_copy(). diff --git a/gio/gfile.h b/gio/gfile.h index 368bb045f..1efbfa03b 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileattribute-priv.h b/gio/gfileattribute-priv.h index 10cc850bc..c42f937c0 100644 --- a/gio/gfileattribute-priv.h +++ b/gio/gfileattribute-priv.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c index 09f01c00a..9b16a765f 100644 --- a/gio/gfileattribute.c +++ b/gio/gfileattribute.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h index b0b091673..a55104701 100644 --- a/gio/gfileattribute.h +++ b/gio/gfileattribute.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfiledescriptorbased.c b/gio/gfiledescriptorbased.c index a0ae22241..54655ddab 100644 --- a/gio/gfiledescriptorbased.c +++ b/gio/gfiledescriptorbased.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfiledescriptorbased.h b/gio/gfiledescriptorbased.h index 7c9d8bc41..1709c5f05 100644 --- a/gio/gfiledescriptorbased.h +++ b/gio/gfiledescriptorbased.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index e4905d7f8..3e4db13b8 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h index fddcbe134..d4fd396b6 100644 --- a/gio/gfileenumerator.h +++ b/gio/gfileenumerator.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileicon.c b/gio/gfileicon.c index fb76d8a1a..48d4c8289 100644 --- a/gio/gfileicon.c +++ b/gio/gfileicon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileicon.h b/gio/gfileicon.h index 90429703c..08a4ea6cf 100644 --- a/gio/gfileicon.h +++ b/gio/gfileicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileinfo-priv.h b/gio/gfileinfo-priv.h index 1c1e4a170..201b8c946 100644 --- a/gio/gfileinfo-priv.h +++ b/gio/gfileinfo-priv.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index 447713bb3..be7bef019 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h index 10832db00..4decee346 100644 --- a/gio/gfileinfo.h +++ b/gio/gfileinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c index 2dcd0ac74..df956ae27 100644 --- a/gio/gfileinputstream.c +++ b/gio/gfileinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h index 4e37e0733..f84eecce1 100644 --- a/gio/gfileinputstream.h +++ b/gio/gfileinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c index 30e90673c..5919c28c0 100644 --- a/gio/gfileiostream.c +++ b/gio/gfileiostream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileiostream.h b/gio/gfileiostream.h index 4c3919ad0..ca61db65d 100644 --- a/gio/gfileiostream.h +++ b/gio/gfileiostream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c index c52aa7f81..36d35a88e 100644 --- a/gio/gfilemonitor.c +++ b/gio/gfilemonitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h index 7b17f9f06..724d8def8 100644 --- a/gio/gfilemonitor.h +++ b/gio/gfilemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c index bf681f076..2550fecec 100644 --- a/gio/gfilenamecompleter.c +++ b/gio/gfilenamecompleter.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h index 28e31681a..b10f18de9 100644 --- a/gio/gfilenamecompleter.h +++ b/gio/gfilenamecompleter.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c index e6e298a75..d0839c2b2 100644 --- a/gio/gfileoutputstream.c +++ b/gio/gfileoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h index bec9f9125..5df63efba 100644 --- a/gio/gfileoutputstream.h +++ b/gio/gfileoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c index 1c69560e7..05e511c2c 100644 --- a/gio/gfilterinputstream.c +++ b/gio/gfilterinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h index a45b83eda..b44a45891 100644 --- a/gio/gfilterinputstream.h +++ b/gio/gfilterinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c index 9089579e3..9d864932e 100644 --- a/gio/gfilteroutputstream.c +++ b/gio/gfilteroutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h index 5f2faa77f..105e72be2 100644 --- a/gio/gfilteroutputstream.h +++ b/gio/gfilteroutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ggtknotificationbackend.c b/gio/ggtknotificationbackend.c index c5ceced90..8d6eab2fb 100644 --- a/gio/ggtknotificationbackend.c +++ b/gio/ggtknotificationbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -58,7 +58,8 @@ g_gtk_notification_backend_is_supported (void) if (session_bus == NULL) return FALSE; - reply = g_dbus_connection_call_sync (session_bus, "org.freedesktop.DBus", "/", "org.freedesktop.DBus", + reply = g_dbus_connection_call_sync (session_bus, "org.freedesktop.DBus", "/org/freedesktop/DBus", + "org.freedesktop.DBus", "GetNameOwner", g_variant_new ("(s)", "org.gtk.Notifications"), G_VARIANT_TYPE ("(s)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL); diff --git a/gio/ghttpproxy.c b/gio/ghttpproxy.c index 173960db2..554e85ec3 100644 --- a/gio/ghttpproxy.c +++ b/gio/ghttpproxy.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ghttpproxy.h b/gio/ghttpproxy.h index f87f40945..21c0100fd 100644 --- a/gio/ghttpproxy.h +++ b/gio/ghttpproxy.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gicon.c b/gio/gicon.c index 03c8c018e..5f943f559 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gicon.h b/gio/gicon.h index b0c45b4bd..a4a03cbec 100644 --- a/gio/gicon.h +++ b/gio/gicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetaddress.c b/gio/ginetaddress.c index 671f228da..0a0a85a48 100644 --- a/gio/ginetaddress.c +++ b/gio/ginetaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetaddress.h b/gio/ginetaddress.h index c1fdf6915..2963affa4 100644 --- a/gio/ginetaddress.h +++ b/gio/ginetaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetaddressmask.c b/gio/ginetaddressmask.c index 2279abf30..058595e94 100644 --- a/gio/ginetaddressmask.c +++ b/gio/ginetaddressmask.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetaddressmask.h b/gio/ginetaddressmask.h index 03db50d1e..ce5e285c6 100644 --- a/gio/ginetaddressmask.h +++ b/gio/ginetaddressmask.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetsocketaddress.c b/gio/ginetsocketaddress.c index fa10619a6..81a527f6d 100644 --- a/gio/ginetsocketaddress.c +++ b/gio/ginetsocketaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginetsocketaddress.h b/gio/ginetsocketaddress.h index 745936e68..e05ba0989 100644 --- a/gio/ginetsocketaddress.h +++ b/gio/ginetsocketaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginitable.c b/gio/ginitable.c index 87cf55454..b5b500618 100644 --- a/gio/ginitable.c +++ b/gio/ginitable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginitable.h b/gio/ginitable.h index f5983d240..c29098d53 100644 --- a/gio/ginitable.h +++ b/gio/ginitable.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginputstream.c b/gio/ginputstream.c index 87e23ae58..e0b34eddc 100644 --- a/gio/ginputstream.c +++ b/gio/ginputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/ginputstream.h b/gio/ginputstream.h index e6879ec65..53b14e387 100644 --- a/gio/ginputstream.h +++ b/gio/ginputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h index 42c97cf69..624702289 100644 --- a/gio/gio-autocleanups.h +++ b/gio/gio-autocleanups.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-querymodules.c b/gio/gio-querymodules.c index 2a658483e..5d488bc91 100644 --- a/gio/gio-querymodules.c +++ b/gio/gio-querymodules.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-cat.c b/gio/gio-tool-cat.c index d09fbda2f..dcf869c3f 100644 --- a/gio/gio-tool-cat.c +++ b/gio/gio-tool-cat.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-copy.c b/gio/gio-tool-copy.c index 706827c89..c6a9b6b2d 100644 --- a/gio/gio-tool-copy.c +++ b/gio/gio-tool-copy.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-info.c b/gio/gio-tool-info.c index 9cd2ea227..c446d60e8 100644 --- a/gio/gio-tool-info.c +++ b/gio/gio-tool-info.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-list.c b/gio/gio-tool-list.c index 116ed1fe6..202d79978 100644 --- a/gio/gio-tool-list.c +++ b/gio/gio-tool-list.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-mime.c b/gio/gio-tool-mime.c index 865416664..f564b1fd9 100644 --- a/gio/gio-tool-mime.c +++ b/gio/gio-tool-mime.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-mkdir.c b/gio/gio-tool-mkdir.c index 060e5684c..3d7b50a02 100644 --- a/gio/gio-tool-mkdir.c +++ b/gio/gio-tool-mkdir.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-monitor.c b/gio/gio-tool-monitor.c index c9d878a6d..9c0352cf9 100644 --- a/gio/gio-tool-monitor.c +++ b/gio/gio-tool-monitor.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-mount.c b/gio/gio-tool-mount.c index e04004aca..9522713e9 100644 --- a/gio/gio-tool-mount.c +++ b/gio/gio-tool-mount.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -998,7 +998,7 @@ monitor_mount_added (GVolumeMonitor *volume_monitor, GMount *mount) { char *name; name = g_mount_get_name (mount); - g_print ("Mount added: '%s'\n", name); + g_print ("Mount added: '%s'\n", name); g_free (name); monitor_print_mount (mount); } @@ -1008,7 +1008,7 @@ monitor_mount_removed (GVolumeMonitor *volume_monitor, GMount *mount) { char *name; name = g_mount_get_name (mount); - g_print ("Mount removed: '%s'\n", name); + g_print ("Mount removed: '%s'\n", name); g_free (name); monitor_print_mount (mount); } @@ -1018,7 +1018,7 @@ monitor_mount_changed (GVolumeMonitor *volume_monitor, GMount *mount) { char *name; name = g_mount_get_name (mount); - g_print ("Mount changed: '%s'\n", name); + g_print ("Mount changed: '%s'\n", name); g_free (name); monitor_print_mount (mount); } diff --git a/gio/gio-tool-move.c b/gio/gio-tool-move.c index 9f3c20b66..97e11d26e 100644 --- a/gio/gio-tool-move.c +++ b/gio/gio-tool-move.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-open.c b/gio/gio-tool-open.c index 217cf9624..fc74186f7 100644 --- a/gio/gio-tool-open.c +++ b/gio/gio-tool-open.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-remove.c b/gio/gio-tool-remove.c index b649fe857..bf3a0fac6 100644 --- a/gio/gio-tool-remove.c +++ b/gio/gio-tool-remove.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-rename.c b/gio/gio-tool-rename.c index 820208f58..36e4a8e20 100644 --- a/gio/gio-tool-rename.c +++ b/gio/gio-tool-rename.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-save.c b/gio/gio-tool-save.c index 3e4497b57..49ab720c4 100644 --- a/gio/gio-tool-save.c +++ b/gio/gio-tool-save.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-set.c b/gio/gio-tool-set.c index 411c132ad..acb471aca 100644 --- a/gio/gio-tool-set.c +++ b/gio/gio-tool-set.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-trash.c b/gio/gio-tool-trash.c index 7f9cc6499..7f30f2dd4 100644 --- a/gio/gio-tool-trash.c +++ b/gio/gio-tool-trash.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool-tree.c b/gio/gio-tool-tree.c index d93d8c5b7..8a68c3d18 100644 --- a/gio/gio-tool-tree.c +++ b/gio/gio-tool-tree.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool.c b/gio/gio-tool.c index 3b79d21b2..b4a863b45 100644 --- a/gio/gio-tool.c +++ b/gio/gio-tool.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio-tool.h b/gio/gio-tool.h index 58cc0f4c5..5064165a6 100644 --- a/gio/gio-tool.h +++ b/gio/gio-tool.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gio.rc b/gio/gio.rc index 570707672..4f8ec7ee3 100644 --- a/gio/gio.rc +++ b/gio/gio.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,2,0 - PRODUCTVERSION 2,53,2,0 + FILEVERSION 2,53,3,0 + PRODUCTVERSION 2,53,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "Gio" - VALUE "FileVersion", "2.53.2.0" + VALUE "FileVersion", "2.53.3.0" VALUE "InternalName", "libgio-2.0-0" VALUE "LegalCopyright", "Copyright © 2006-2011 Red Hat, Inc. and others." VALUE "OriginalFilename", "libgio-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.2" + VALUE "ProductVersion", "2.53.3" END END BLOCK "VarFileInfo" diff --git a/gio/gio_trace.h b/gio/gio_trace.h index ba69a6eaa..47d4eacb2 100644 --- a/gio/gio_trace.h +++ b/gio/gio_trace.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioenums.h b/gio/gioenums.h index ee17370e7..c33b3919b 100644 --- a/gio/gioenums.h +++ b/gio/gioenums.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioerror.c b/gio/gioerror.c index ed80c6ebc..ccdd67dbc 100644 --- a/gio/gioerror.c +++ b/gio/gioerror.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioerror.h b/gio/gioerror.h index 035e9e22c..b3d644646 100644 --- a/gio/gioerror.h +++ b/gio/gioerror.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giomodule-priv.h b/gio/giomodule-priv.h index 2a510557c..e48059313 100644 --- a/gio/giomodule-priv.h +++ b/gio/giomodule-priv.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giomodule.c b/gio/giomodule.c index ad4d4e640..6937932b2 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giomodule.h b/gio/giomodule.h index f67185ba2..485f5eb9f 100644 --- a/gio/giomodule.h +++ b/gio/giomodule.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioprivate.h b/gio/gioprivate.h index b3f65bfca..b79192566 100644 --- a/gio/gioprivate.h +++ b/gio/gioprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioscheduler.c b/gio/gioscheduler.c index b8f87d549..c146e0796 100644 --- a/gio/gioscheduler.c +++ b/gio/gioscheduler.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h index d852a216f..d58cff603 100644 --- a/gio/gioscheduler.h +++ b/gio/gioscheduler.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giostream.c b/gio/giostream.c index 423c1070c..924e39a34 100644 --- a/gio/giostream.c +++ b/gio/giostream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giostream.h b/gio/giostream.h index 561b0e964..5dbe0e6e6 100644 --- a/gio/giostream.h +++ b/gio/giostream.h @@ -3,10 +3,10 @@ * Copyright © 2008, 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/giotypes.h b/gio/giotypes.h index 15bed4824..67c9cc7b7 100644 --- a/gio/giotypes.h +++ b/gio/giotypes.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/giowin32-priv.h b/gio/giowin32-priv.h index 7391a2ae7..8843845d5 100644 --- a/gio/giowin32-priv.h +++ b/gio/giowin32-priv.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c index 9375955ad..a37978e83 100644 --- a/gio/gkeyfilesettingsbackend.c +++ b/gio/gkeyfilesettingsbackend.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index eddb97738..a92fefd7d 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c index e190ff5af..32cac9959 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glistmodel.c b/gio/glistmodel.c index 1be34af32..c2491be2d 100644 --- a/gio/glistmodel.c +++ b/gio/glistmodel.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glistmodel.h b/gio/glistmodel.h index bfd000199..48348afd5 100644 --- a/gio/glistmodel.h +++ b/gio/glistmodel.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gliststore.c b/gio/gliststore.c index 7f8c02aac..7cb118d76 100644 --- a/gio/gliststore.c +++ b/gio/gliststore.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gliststore.h b/gio/gliststore.h index cc8011e6d..407d542fb 100644 --- a/gio/gliststore.h +++ b/gio/gliststore.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c index eeccd8dd9..24654533e 100644 --- a/gio/gloadableicon.c +++ b/gio/gloadableicon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h index d164ca028..c2951c991 100644 --- a/gio/gloadableicon.h +++ b/gio/gloadableicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfile.c b/gio/glocalfile.c index 64c5b6898..002c15196 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfile.h b/gio/glocalfile.h index 6b1422295..960cfef1f 100644 --- a/gio/glocalfile.h +++ b/gio/glocalfile.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c index ddf8e56ef..4f316f7ea 100644 --- a/gio/glocalfileenumerator.c +++ b/gio/glocalfileenumerator.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileenumerator.h b/gio/glocalfileenumerator.h index c718799f0..7277bf3b2 100644 --- a/gio/glocalfileenumerator.h +++ b/gio/glocalfileenumerator.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 113a20bc1..eb364ac5a 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileinfo.h b/gio/glocalfileinfo.h index 16eb43d85..f0362889f 100644 --- a/gio/glocalfileinfo.h +++ b/gio/glocalfileinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileinputstream.c b/gio/glocalfileinputstream.c index 2b7944462..0d72c52e2 100644 --- a/gio/glocalfileinputstream.c +++ b/gio/glocalfileinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileinputstream.h b/gio/glocalfileinputstream.h index 6dddc929f..ee8c96046 100644 --- a/gio/glocalfileinputstream.h +++ b/gio/glocalfileinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileiostream.c b/gio/glocalfileiostream.c index ad03d2ba6..30e68488e 100644 --- a/gio/glocalfileiostream.c +++ b/gio/glocalfileiostream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileiostream.h b/gio/glocalfileiostream.h index 62305f774..8c959208f 100644 --- a/gio/glocalfileiostream.h +++ b/gio/glocalfileiostream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c index 49a4dd210..7953bf0d9 100644 --- a/gio/glocalfilemonitor.c +++ b/gio/glocalfilemonitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfilemonitor.h b/gio/glocalfilemonitor.h index 1eacaf676..7f3baadbd 100644 --- a/gio/glocalfilemonitor.h +++ b/gio/glocalfilemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index 65c51d71f..4b3733cce 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -763,7 +763,13 @@ handle_overwrite_open (const char *filename, #ifdef O_NOFOLLOW is_symlink = FALSE; fd = g_open (filename, open_flags | O_NOFOLLOW, mode); +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + if (fd == -1 && errno == EMLINK) +#elif defined(__NetBSD__) + if (fd == -1 && errno == EFTYPE) +#else if (fd == -1 && errno == ELOOP) +#endif { /* Could be a symlink, or it could be a regular ELOOP error, * but then the next open will fail too. */ diff --git a/gio/glocalfileoutputstream.h b/gio/glocalfileoutputstream.h index b4a5f1736..d530292c3 100644 --- a/gio/glocalfileoutputstream.h +++ b/gio/glocalfileoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalfileprivate.h b/gio/glocalfileprivate.h index b4090a743..6b77305e7 100644 --- a/gio/glocalfileprivate.h +++ b/gio/glocalfileprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalvfs.c b/gio/glocalvfs.c index b0bae9cf7..4f1462de9 100644 --- a/gio/glocalvfs.c +++ b/gio/glocalvfs.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/glocalvfs.h b/gio/glocalvfs.h index 39acc5dd7..8d65049d8 100644 --- a/gio/glocalvfs.h +++ b/gio/glocalvfs.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c index c77aeb7d8..37846b6ac 100644 --- a/gio/gmemoryinputstream.c +++ b/gio/gmemoryinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h index ee1be364b..7563fd648 100644 --- a/gio/gmemoryinputstream.h +++ b/gio/gmemoryinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c index 44720f14f..de8babfa5 100644 --- a/gio/gmemoryoutputstream.c +++ b/gio/gmemoryoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h index a7151f31d..5418d23d8 100644 --- a/gio/gmemoryoutputstream.h +++ b/gio/gmemoryoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmemorysettingsbackend.c b/gio/gmemorysettingsbackend.c index b0d58b568..5bb96bf29 100644 --- a/gio/gmemorysettingsbackend.c +++ b/gio/gmemorysettingsbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenu.c b/gio/gmenu.c index b1f99d4e6..95602520c 100644 --- a/gio/gmenu.c +++ b/gio/gmenu.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenu.h b/gio/gmenu.h index 084b58ac4..660943834 100644 --- a/gio/gmenu.h +++ b/gio/gmenu.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenuexporter.c b/gio/gmenuexporter.c index 68a59aec1..e5ad54a5e 100644 --- a/gio/gmenuexporter.c +++ b/gio/gmenuexporter.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenuexporter.h b/gio/gmenuexporter.h index be06de3d2..650aaf0ed 100644 --- a/gio/gmenuexporter.h +++ b/gio/gmenuexporter.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenumodel.c b/gio/gmenumodel.c index 318358fec..f4d7fcae5 100644 --- a/gio/gmenumodel.c +++ b/gio/gmenumodel.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmenumodel.h b/gio/gmenumodel.h index 56db677aa..34c8d0f39 100644 --- a/gio/gmenumodel.h +++ b/gio/gmenumodel.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Ltd. * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmount.c b/gio/gmount.c index b06954e97..3d74b855d 100644 --- a/gio/gmount.c +++ b/gio/gmount.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmount.h b/gio/gmount.h index 133974393..c376a6135 100644 --- a/gio/gmount.h +++ b/gio/gmount.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c index d0ede5d7e..2a2b4ce5b 100644 --- a/gio/gmountoperation.c +++ b/gio/gmountoperation.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h index f3155a5b3..e73081875 100644 --- a/gio/gmountoperation.h +++ b/gio/gmountoperation.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gmountprivate.h b/gio/gmountprivate.h index 2325c1fbb..cbe917cee 100644 --- a/gio/gmountprivate.h +++ b/gio/gmountprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnativesocketaddress.c b/gio/gnativesocketaddress.c index c1c175669..60d81e641 100644 --- a/gio/gnativesocketaddress.c +++ b/gio/gnativesocketaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnativesocketaddress.h b/gio/gnativesocketaddress.h index 74d18870e..032cd00a4 100644 --- a/gio/gnativesocketaddress.h +++ b/gio/gnativesocketaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c index 3a99c9501..1997f2e2e 100644 --- a/gio/gnativevolumemonitor.c +++ b/gio/gnativevolumemonitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnativevolumemonitor.h b/gio/gnativevolumemonitor.h index 39162d2ba..739054705 100644 --- a/gio/gnativevolumemonitor.h +++ b/gio/gnativevolumemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c index ba82164de..5231cad8f 100644 --- a/gio/gnetworkaddress.c +++ b/gio/gnetworkaddress.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkaddress.h b/gio/gnetworkaddress.h index d1e747036..10bb0b502 100644 --- a/gio/gnetworkaddress.h +++ b/gio/gnetworkaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworking.c b/gio/gnetworking.c index c90aa9a15..fea4309dd 100644 --- a/gio/gnetworking.c +++ b/gio/gnetworking.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworking.h.in b/gio/gnetworking.h.in index 0bb21c3b9..f9582b99e 100644 --- a/gio/gnetworking.h.in +++ b/gio/gnetworking.h.in @@ -5,15 +5,15 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_NETWORKING_H__ diff --git a/gio/gnetworking.h.win32 b/gio/gnetworking.h.win32 index 61014be90..1f45dba32 100644 --- a/gio/gnetworking.h.win32 +++ b/gio/gnetworking.h.win32 @@ -5,15 +5,15 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_NETWORKING_H__ diff --git a/gio/gnetworkingprivate.h b/gio/gnetworkingprivate.h index b28ff4417..fe126d6ec 100644 --- a/gio/gnetworkingprivate.h +++ b/gio/gnetworkingprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c index 4f51e3e1d..b38f4086a 100644 --- a/gio/gnetworkmonitor.c +++ b/gio/gnetworkmonitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h index 10b180ac7..c863fbf2d 100644 --- a/gio/gnetworkmonitor.h +++ b/gio/gnetworkmonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitorbase.c b/gio/gnetworkmonitorbase.c index 744bc2b0c..d42f6d4ab 100644 --- a/gio/gnetworkmonitorbase.c +++ b/gio/gnetworkmonitorbase.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitorbase.h b/gio/gnetworkmonitorbase.h index 7970f7c47..20a84fcdf 100644 --- a/gio/gnetworkmonitorbase.h +++ b/gio/gnetworkmonitorbase.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c index 776628bbe..d3f1dce6d 100644 --- a/gio/gnetworkmonitornetlink.c +++ b/gio/gnetworkmonitornetlink.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitornetlink.h b/gio/gnetworkmonitornetlink.h index 582479184..e6aedf02a 100644 --- a/gio/gnetworkmonitornetlink.h +++ b/gio/gnetworkmonitornetlink.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c index 5bab65d6e..6f3f6ce6d 100644 --- a/gio/gnetworkmonitornm.c +++ b/gio/gnetworkmonitornm.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitornm.h b/gio/gnetworkmonitornm.h index 7a4bbe4c5..b8000892d 100644 --- a/gio/gnetworkmonitornm.h +++ b/gio/gnetworkmonitornm.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitorportal.c b/gio/gnetworkmonitorportal.c index ea9fb5bf8..268683470 100644 --- a/gio/gnetworkmonitorportal.c +++ b/gio/gnetworkmonitorportal.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkmonitorportal.h b/gio/gnetworkmonitorportal.h index 3d25f57be..3b2a39199 100644 --- a/gio/gnetworkmonitorportal.h +++ b/gio/gnetworkmonitorportal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkservice.c b/gio/gnetworkservice.c index d2b9017be..4d4093b3c 100644 --- a/gio/gnetworkservice.c +++ b/gio/gnetworkservice.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnetworkservice.h b/gio/gnetworkservice.h index 678f0559a..9cdb4ab47 100644 --- a/gio/gnetworkservice.h +++ b/gio/gnetworkservice.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnextstepsettingsbackend.c b/gio/gnextstepsettingsbackend.c index f9b808ce7..44ea845d8 100644 --- a/gio/gnextstepsettingsbackend.c +++ b/gio/gnextstepsettingsbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnotification-private.h b/gio/gnotification-private.h index e12a42369..e3e4a7818 100644 --- a/gio/gnotification-private.h +++ b/gio/gnotification-private.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnotification.c b/gio/gnotification.c index 06a41b9f3..76f813eca 100644 --- a/gio/gnotification.c +++ b/gio/gnotification.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnotification.h b/gio/gnotification.h index 07600b3b1..55e683012 100644 --- a/gio/gnotification.h +++ b/gio/gnotification.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnotificationbackend.c b/gio/gnotificationbackend.c index 5fa50bbbd..b2c0729e8 100644 --- a/gio/gnotificationbackend.c +++ b/gio/gnotificationbackend.c @@ -1,10 +1,10 @@ /* * Copyright © 2013 Lars Uebernickel * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnotificationbackend.h b/gio/gnotificationbackend.h index d26123a97..85c0f2d49 100644 --- a/gio/gnotificationbackend.h +++ b/gio/gnotificationbackend.h @@ -1,10 +1,10 @@ /* * Copyright © 2013 Lars Uebernickel * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gnullsettingsbackend.c b/gio/gnullsettingsbackend.c index 9f8a34ce8..6b6f8cf75 100644 --- a/gio/gnullsettingsbackend.c +++ b/gio/gnullsettingsbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gopenuriportal.c b/gio/gopenuriportal.c new file mode 100644 index 000000000..1a68cf97c --- /dev/null +++ b/gio/gopenuriportal.c @@ -0,0 +1,317 @@ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright 2017 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> + +#include "gopenuriportal.h" +#include "xdp-dbus.h" +#include "gstdio.h" + +#ifdef G_OS_UNIX +#include "gunixfdlist.h" +#endif + +#ifndef O_PATH +#define O_PATH 0 +#endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#else +#define HAVE_O_CLOEXEC 1 +#endif + + +static GXdpOpenURI *openuri; + +static gboolean +init_openuri_portal (void) +{ + static gsize openuri_inited = 0; + + if (g_once_init_enter (&openuri_inited)) + { + GError *error = NULL; + GDBusConnection *connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + + if (connection != NULL) + { + openuri = gxdp_open_uri_proxy_new_sync (connection, 0, + "org.freedesktop.portal.Desktop", + "/org/freedesktop/portal/desktop", + NULL, &error); + if (openuri == NULL) + { + g_warning ("Cannot create document portal proxy: %s", error->message); + g_error_free (error); + } + + g_object_unref (connection); + } + else + { + g_warning ("Cannot connect to session bus when initializing document portal: %s", + error->message); + g_error_free (error); + } + + g_once_init_leave (&openuri_inited, 1); + } + + return openuri != NULL; +} + +gboolean +g_openuri_portal_open_uri (const char *uri, + const char *parent_window, + GError **error) +{ + GFile *file = NULL; + GVariantBuilder opt_builder; + gboolean res; + + if (!init_openuri_portal ()) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_INITIALIZED, + "OpenURI portal is not available"); + return FALSE; + } + + g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT); + + file = g_file_new_for_uri (uri); + if (g_file_is_native (file)) + { + char *path = NULL; + GUnixFDList *fd_list = NULL; + int fd, fd_id; + + path = g_file_get_path (file); + + fd = g_open (path, O_PATH | O_CLOEXEC); + if (fd == -1) + { + g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), + "Failed to open '%s'", path); + return FALSE; + } + +#ifndef HAVE_O_CLOEXEC + fcntl (fd, F_SETFD, FD_CLOEXEC); +#endif + fd_list = g_unix_fd_list_new_from_array (&fd, 1); + fd = -1; + fd_id = 0; + + res = gxdp_open_uri_call_open_file_sync (openuri, + parent_window ? parent_window : "", + g_variant_new ("h", fd_id), + g_variant_builder_end (&opt_builder), + fd_list, + NULL, + NULL, + NULL, + error); + g_free (path); + g_object_unref (fd_list); + } + else + { + res = gxdp_open_uri_call_open_uri_sync (openuri, + parent_window ? parent_window : "", + uri, + g_variant_builder_end (&opt_builder), + NULL, + NULL, + error); + } + + g_object_unref (file); + + return res; +} + +enum { + XDG_DESKTOP_PORTAL_SUCCESS = 0, + XDG_DESKTOP_PORTAL_CANCELLED = 1, + XDG_DESKTOP_PORTAL_FAILED = 2 +}; + +static void +response_received (GDBusConnection *connection, + const char *sender_name, + const char *object_path, + const char *interface_name, + const char *signal_name, + GVariant *parameters, + gpointer user_data) +{ + GTask *task = user_data; + guint32 response; + guint signal_id; + + signal_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (task), "signal-id")); + g_dbus_connection_signal_unsubscribe (connection, signal_id); + + g_variant_get (parameters, "(u@a{sv})", &response, NULL); + + switch (response) + { + case XDG_DESKTOP_PORTAL_SUCCESS: + g_task_return_boolean (task, TRUE); + break; + case XDG_DESKTOP_PORTAL_CANCELLED: + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, "Launch cancelled"); + break; + case XDG_DESKTOP_PORTAL_FAILED: + default: + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Launch failed"); + break; + } + + g_object_unref (task); +} + +static void +open_call_done (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GDBusConnection *connection = G_DBUS_CONNECTION (source); + GTask *task = user_data; + GError *error = NULL; + gboolean open_file; + gboolean res; + char *path; + guint signal_id; + + open_file = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (task), "open-file")); + + if (open_file) + res = gxdp_open_uri_call_open_file_finish (openuri, &path, NULL, result, &error); + else + res = gxdp_open_uri_call_open_uri_finish (openuri, &path, result, &error); + + if (!res) + { + g_task_return_error (task, error); + g_object_unref (task); + g_free (path); + return; + } + + signal_id = g_dbus_connection_signal_subscribe (connection, + "org.freedesktop.portal.Desktop", + "org.freedesktop.portal.Request", + "Response", + path, + NULL, + G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE, + response_received, + task, + NULL); + g_object_set_data (G_OBJECT (task), "signal-id", GINT_TO_POINTER (signal_id)); +} + +void +g_openuri_portal_open_uri_async (const char *uri, + const char *parent_window, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + GFile *file; + GVariantBuilder opt_builder; + + if (!init_openuri_portal ()) + { + g_task_report_new_error (NULL, callback, user_data, NULL, + G_IO_ERROR, G_IO_ERROR_NOT_INITIALIZED, + "OpenURI portal is not available"); + return; + } + + if (callback) + task = g_task_new (NULL, cancellable, callback, user_data); + else + task = NULL; + + g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT); + + file = g_file_new_for_uri (uri); + if (g_file_is_native (file)) + { + char *path = NULL; + GUnixFDList *fd_list = NULL; + int fd, fd_id; + + if (task) + g_object_set_data (G_OBJECT (task), "open-file", GINT_TO_POINTER (TRUE)); + + path = g_file_get_path (file); + fd = g_open (path, O_PATH | O_CLOEXEC); + if (fd == -1) + { + g_task_report_new_error (NULL, callback, user_data, NULL, + G_IO_ERROR, g_io_error_from_errno (errno), + "OpenURI portal is not available"); + return; + } + +#ifndef HAVE_O_CLOEXEC + fcntl (fd, F_SETFD, FD_CLOEXEC); +#endif + fd_list = g_unix_fd_list_new_from_array (&fd, 1); + fd = -1; + fd_id = 0; + + gxdp_open_uri_call_open_file (openuri, + parent_window ? parent_window : "", + g_variant_new ("h", fd_id), + g_variant_builder_end (&opt_builder), + fd_list, + cancellable, + task ? open_call_done : NULL, + task); + g_object_unref (fd_list); + g_free (path); + } + else + { + gxdp_open_uri_call_open_uri (openuri, + parent_window ? parent_window : "", + uri, + g_variant_builder_end (&opt_builder), + cancellable, + task ? open_call_done : NULL, + task); + } + + g_object_unref (file); +} + +gboolean +g_openuri_portal_open_uri_finish (GAsyncResult *result, + GError **error) +{ + return g_task_propagate_boolean (G_TASK (result), error); +} diff --git a/gio/gopenuriportal.h b/gio/gopenuriportal.h new file mode 100644 index 000000000..00863ef90 --- /dev/null +++ b/gio/gopenuriportal.h @@ -0,0 +1,41 @@ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright 2017 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __G_OPEN_URI_PORTAL_H__ + +#include <glib.h> +#include <gio/gio.h> + +G_BEGIN_DECLS + +gboolean g_openuri_portal_open_uri (const char *uri, + const char *parent_window, + GError **error); + +void g_openuri_portal_open_uri_async (const char *uri, + const char *parent_window, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean g_openuri_portal_open_uri_finish (GAsyncResult *result, + GError **error); + +G_END_DECLS + +#endif diff --git a/gio/gosxappinfo.c b/gio/gosxappinfo.c index ce7081701..b24b6fffa 100644 --- a/gio/gosxappinfo.c +++ b/gio/gosxappinfo.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gosxappinfo.h b/gio/gosxappinfo.h index 6a21f4dcf..7beeaad16 100644 --- a/gio/gosxappinfo.h +++ b/gio/gosxappinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gosxcontenttype.c b/gio/gosxcontenttype.c index 8c15ec76e..485f5bfb6 100644 --- a/gio/gosxcontenttype.c +++ b/gio/gosxcontenttype.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/goutputstream.c b/gio/goutputstream.c index 354c006b2..0f5b9d9ee 100644 --- a/gio/goutputstream.c +++ b/gio/goutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/goutputstream.h b/gio/goutputstream.h index bc42abd0a..fef1b8fdf 100644 --- a/gio/goutputstream.h +++ b/gio/goutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpermission.c b/gio/gpermission.c index 0c021daff..966fc6c80 100644 --- a/gio/gpermission.c +++ b/gio/gpermission.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpermission.h b/gio/gpermission.h index 7eb63a47a..0c2b0bdf5 100644 --- a/gio/gpermission.h +++ b/gio/gpermission.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c index 2a43ea4cd..6a13f34b6 100644 --- a/gio/gpollableinputstream.c +++ b/gio/gpollableinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableinputstream.h b/gio/gpollableinputstream.h index f0a97ea3f..ce50312e7 100644 --- a/gio/gpollableinputstream.h +++ b/gio/gpollableinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableoutputstream.c b/gio/gpollableoutputstream.c index 24e159630..9bd6b8cd0 100644 --- a/gio/gpollableoutputstream.c +++ b/gio/gpollableoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableoutputstream.h b/gio/gpollableoutputstream.h index f1c183bc0..bf13584d5 100644 --- a/gio/gpollableoutputstream.h +++ b/gio/gpollableoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableutils.c b/gio/gpollableutils.c index 84e4ecd04..b77e65404 100644 --- a/gio/gpollableutils.c +++ b/gio/gpollableutils.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollableutils.h b/gio/gpollableutils.h index 1401873f4..007048cf1 100644 --- a/gio/gpollableutils.h +++ b/gio/gpollableutils.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c index f87649e0a..da7f1c5fa 100644 --- a/gio/gpollfilemonitor.c +++ b/gio/gpollfilemonitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpollfilemonitor.h b/gio/gpollfilemonitor.h index 4806af0cf..227c20a19 100644 --- a/gio/gpollfilemonitor.h +++ b/gio/gpollfilemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gportalnotificationbackend.c b/gio/gportalnotificationbackend.c index e6c728b7b..b0d67aa2a 100644 --- a/gio/gportalnotificationbackend.c +++ b/gio/gportalnotificationbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gportalsupport.c b/gio/gportalsupport.c index 12b4ffdb5..2f1e82517 100644 --- a/gio/gportalsupport.c +++ b/gio/gportalsupport.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gportalsupport.h b/gio/gportalsupport.h index a92e07ca7..a331f45d3 100644 --- a/gio/gportalsupport.h +++ b/gio/gportalsupport.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpropertyaction.c b/gio/gpropertyaction.c index 52cee4b73..c1ce813ae 100644 --- a/gio/gpropertyaction.c +++ b/gio/gpropertyaction.c @@ -1,10 +1,10 @@ /* * Copyright © 2013 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gpropertyaction.h b/gio/gpropertyaction.h index 776585810..6fb4e6330 100644 --- a/gio/gpropertyaction.h +++ b/gio/gpropertyaction.h @@ -1,10 +1,10 @@ /* * Copyright © 2013 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxy.c b/gio/gproxy.c index 9419d5709..b7e322101 100644 --- a/gio/gproxy.c +++ b/gio/gproxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxy.h b/gio/gproxy.h index 9a169c945..5589f21dc 100644 --- a/gio/gproxy.h +++ b/gio/gproxy.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c index 9e3adc467..0b78caa91 100644 --- a/gio/gproxyaddress.c +++ b/gio/gproxyaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyaddress.h b/gio/gproxyaddress.h index 11942de21..21b1992ea 100644 --- a/gio/gproxyaddress.h +++ b/gio/gproxyaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyaddressenumerator.c b/gio/gproxyaddressenumerator.c index be2d9cb83..698df3e82 100644 --- a/gio/gproxyaddressenumerator.c +++ b/gio/gproxyaddressenumerator.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyaddressenumerator.h b/gio/gproxyaddressenumerator.h index a607930f8..4bd05ced6 100644 --- a/gio/gproxyaddressenumerator.h +++ b/gio/gproxyaddressenumerator.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c index 3473b912f..082274e4f 100644 --- a/gio/gproxyresolver.c +++ b/gio/gproxyresolver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyresolver.h b/gio/gproxyresolver.h index 994da01ca..c8ed82812 100644 --- a/gio/gproxyresolver.h +++ b/gio/gproxyresolver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyresolverportal.c b/gio/gproxyresolverportal.c index ff0965dea..c300ec3e8 100644 --- a/gio/gproxyresolverportal.c +++ b/gio/gproxyresolverportal.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gproxyresolverportal.h b/gio/gproxyresolverportal.h index 378a680f0..e1eabdb94 100644 --- a/gio/gproxyresolverportal.h +++ b/gio/gproxyresolverportal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c index e35f48e7d..23a96486f 100644 --- a/gio/gregistrysettingsbackend.c +++ b/gio/gregistrysettingsbackend.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gregistrysettingsbackend.h b/gio/gregistrysettingsbackend.h index cae65d533..13f8b4afd 100644 --- a/gio/gregistrysettingsbackend.h +++ b/gio/gregistrysettingsbackend.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gremoteactiongroup.c b/gio/gremoteactiongroup.c index 451c3e97c..b8e2c0bb9 100644 --- a/gio/gremoteactiongroup.c +++ b/gio/gremoteactiongroup.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gremoteactiongroup.h b/gio/gremoteactiongroup.h index a4d0c307e..206c73734 100644 --- a/gio/gremoteactiongroup.h +++ b/gio/gremoteactiongroup.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresolver.c b/gio/gresolver.c index 0ed7d8f01..f9d0573fb 100644 --- a/gio/gresolver.c +++ b/gio/gresolver.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresolver.h b/gio/gresolver.h index 2950c9d01..a39e8f7fd 100644 --- a/gio/gresolver.h +++ b/gio/gresolver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c index 51fabc192..b25eebf3d 100644 --- a/gio/gresource-tool.c +++ b/gio/gresource-tool.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresource.c b/gio/gresource.c index 7805e3733..9e1d481b0 100644 --- a/gio/gresource.c +++ b/gio/gresource.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -83,6 +83,13 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) * set to the full path to the gdk-pixbuf-pixdata executable; otherwise the resource compiler will * abort. * + * Resource files will be exported in the GResource namespace using the + * combination of the given `prefix` and the filename from the `file` element. + * The `alias` attribute can be used to alter the filename to expose them at a + * different location in the resource namespace. Typically, this is used to + * include files from a different source directory without exposing the source + * directory in the resource namespace, as in the example below. + * * Resource bundles are created by the [glib-compile-resources][glib-compile-resources] program * which takes an XML file that describes the bundle, and a set of files that the XML references. These * are combined into a binary resource bundle. @@ -95,6 +102,7 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) * <file>data/splashscreen.png</file> * <file compressed="true">dialog.ui</file> * <file preprocess="xml-stripblanks">menumarkup.xml</file> + * <file alias="example.css">data/example.css</file> * </gresource> * </gresources> * ]| @@ -104,6 +112,7 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) * /org/gtk/Example/data/splashscreen.png * /org/gtk/Example/dialog.ui * /org/gtk/Example/menumarkup.xml + * /org/gtk/Example/example.css * ]| * * Note that all resources in the process share the same namespace, so use Java-style @@ -124,22 +133,24 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) * to the data. You can also use URIs like "resource:///org/gtk/Example/data/splashscreen.png" with #GFile to access * the resource data. * + * Some higher-level APIs, such as #GtkApplication, will automatically load + * resources from certain well-known paths in the resource namespace as a + * convenience. See the documentation for those APIs for details. + * * There are two forms of the generated source, the default version uses the compiler support for constructor * and destructor functions (where available) to automatically create and register the #GResource on startup - * or library load time. If you pass --manual-register two functions to register/unregister the resource is instead - * created. This requires an explicit initialization call in your application/library, but it works on all platforms, - * even on the minor ones where this is not available. (Constructor support is available for at least Win32, Mac OS and Linux.) + * or library load time. If you pass `--manual-register`, two functions to register/unregister the resource are created + * instead. This requires an explicit initialization call in your application/library, but it works on all platforms, + * even on the minor ones where constructors are not supported. (Constructor support is available for at least Win32, Mac OS and Linux.) * * Note that resource data can point directly into the data segment of e.g. a library, so if you are unloading libraries * during runtime you need to be very careful with keeping around pointers to data from a resource, as this goes away * when the library is unloaded. However, in practice this is not generally a problem, since most resource accesses - * is for your own resources, and resource data is often used once, during parsing, and then released. + * are for your own resources, and resource data is often used once, during parsing, and then released. * * When debugging a program or testing a change to an installed version, it is often useful to be able to * replace resources in the program or library, without recompiling, for debugging or quick hacking and testing - * purposes. - * - * Since GLib 2.50, it is possible to use the `G_RESOURCE_OVERLAYS` environment variable to selectively overlay + * purposes. Since GLib 2.50, it is possible to use the `G_RESOURCE_OVERLAYS` environment variable to selectively overlay * resources with replacements from the filesystem. It is a colon-separated list of substitutions to perform * during resource lookups. * diff --git a/gio/gresource.h b/gio/gresource.h index 0fa4475ec..e9870c148 100644 --- a/gio/gresource.h +++ b/gio/gresource.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c index 85c2152e6..739c6e2f1 100644 --- a/gio/gresourcefile.c +++ b/gio/gresourcefile.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gresourcefile.h b/gio/gresourcefile.h index 919564db7..cdf5a0a33 100644 --- a/gio/gresourcefile.h +++ b/gio/gresourcefile.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gseekable.c b/gio/gseekable.c index c1f678970..26159d07e 100644 --- a/gio/gseekable.c +++ b/gio/gseekable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gseekable.h b/gio/gseekable.h index fbfd9e17f..191f3cca2 100644 --- a/gio/gseekable.h +++ b/gio/gseekable.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettings-mapping.c b/gio/gsettings-mapping.c index 12b7f3448..94d5cc705 100644 --- a/gio/gsettings-mapping.c +++ b/gio/gsettings-mapping.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettings-mapping.h b/gio/gsettings-mapping.h index c7c3d82ee..8a26684bb 100644 --- a/gio/gsettings-mapping.h +++ b/gio/gsettings-mapping.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c index 544af848e..63c5a4477 100644 --- a/gio/gsettings-tool.c +++ b/gio/gsettings-tool.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettings.c b/gio/gsettings.c index 4dbb46e10..45b10dd7e 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettings.h b/gio/gsettings.h index ef7020ec5..d3d5a076f 100644 --- a/gio/gsettings.h +++ b/gio/gsettings.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c index 62d75e28c..281ae8e50 100644 --- a/gio/gsettingsbackend.c +++ b/gio/gsettingsbackend.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h index f00471181..34bae6b60 100644 --- a/gio/gsettingsbackend.h +++ b/gio/gsettingsbackend.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsbackendinternal.h b/gio/gsettingsbackendinternal.h index eef4c7a10..2a76a80bc 100644 --- a/gio/gsettingsbackendinternal.h +++ b/gio/gsettingsbackendinternal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h index c6a905f21..f54de3b34 100644 --- a/gio/gsettingsschema-internal.h +++ b/gio/gsettingsschema-internal.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c index 84c6962bc..dc5586428 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h index de81e3765..219e30914 100644 --- a/gio/gsettingsschema.h +++ b/gio/gsettingsschema.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c index ccc8f30e1..54c554087 100644 --- a/gio/gsimpleaction.c +++ b/gio/gsimpleaction.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleaction.h b/gio/gsimpleaction.h index c6292120b..041eb7ecc 100644 --- a/gio/gsimpleaction.h +++ b/gio/gsimpleaction.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleactiongroup.c b/gio/gsimpleactiongroup.c index c62e66f3d..11bc19357 100644 --- a/gio/gsimpleactiongroup.c +++ b/gio/gsimpleactiongroup.c @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleactiongroup.h b/gio/gsimpleactiongroup.h index 4cca76b33..6ad46e7da 100644 --- a/gio/gsimpleactiongroup.h +++ b/gio/gsimpleactiongroup.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c index ff2177ee6..7883463b8 100644 --- a/gio/gsimpleasyncresult.c +++ b/gio/gsimpleasyncresult.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h index 7774004d3..8daa91d40 100644 --- a/gio/gsimpleasyncresult.h +++ b/gio/gsimpleasyncresult.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleiostream.c b/gio/gsimpleiostream.c index aa988c13e..77f65cc9e 100644 --- a/gio/gsimpleiostream.c +++ b/gio/gsimpleiostream.c @@ -1,10 +1,10 @@ /* * Copyright © 2014 NICE s.r.l. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleiostream.h b/gio/gsimpleiostream.h index 47c034efb..37919d32f 100644 --- a/gio/gsimpleiostream.h +++ b/gio/gsimpleiostream.h @@ -1,10 +1,10 @@ /* * Copyright © 2014 NICE s.r.l. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimplepermission.c b/gio/gsimplepermission.c index 5f3161eb6..5ec88b8a0 100644 --- a/gio/gsimplepermission.c +++ b/gio/gsimplepermission.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimplepermission.h b/gio/gsimplepermission.h index df5f3815e..11b8d1224 100644 --- a/gio/gsimplepermission.h +++ b/gio/gsimplepermission.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleproxyresolver.c b/gio/gsimpleproxyresolver.c index a4b9abdcf..145bd5e8c 100644 --- a/gio/gsimpleproxyresolver.c +++ b/gio/gsimpleproxyresolver.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsimpleproxyresolver.h b/gio/gsimpleproxyresolver.h index 8b323907c..e1bb199fa 100644 --- a/gio/gsimpleproxyresolver.h +++ b/gio/gsimpleproxyresolver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocket.c b/gio/gsocket.c index d2f4970f4..248074a49 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -52,6 +52,9 @@ #include <sys/uio.h> #endif +#define GOBJECT_COMPILATION +#include "gobject/gtype-private.h" /* For _PRELUDE type define */ +#undef GOBJECT_COMPILATION #include "gcancellable.h" #include "gdatagrambased.h" #include "gioenumtypes.h" @@ -267,13 +270,20 @@ struct _GSocketPrivate } recv_addr_cache[RECV_ADDR_CACHE_SIZE]; }; -G_DEFINE_TYPE_WITH_CODE (GSocket, g_socket, G_TYPE_OBJECT, - G_ADD_PRIVATE (GSocket) - g_networking_init (); - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_socket_initable_iface_init); - G_IMPLEMENT_INTERFACE (G_TYPE_DATAGRAM_BASED, - g_socket_datagram_based_iface_init)); +_G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE (GSocket, g_socket, G_TYPE_OBJECT, 0, + /* Need a prelude for https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ + g_type_ensure (G_TYPE_SOCKET_FAMILY); + g_type_ensure (G_TYPE_SOCKET_TYPE); + g_type_ensure (G_TYPE_SOCKET_PROTOCOL); + g_type_ensure (G_TYPE_SOCKET_ADDRESS); + /* And networking init is appropriate for the prelude */ + g_networking_init (); + , /* And now the regular type init code */ + G_ADD_PRIVATE (GSocket) + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_socket_initable_iface_init); + G_IMPLEMENT_INTERFACE (G_TYPE_DATAGRAM_BASED, + g_socket_datagram_based_iface_init)); static int get_socket_errno (void) diff --git a/gio/gsocket.h b/gio/gsocket.h index 4e3fb6ab6..613c8dd92 100644 --- a/gio/gsocket.h +++ b/gio/gsocket.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c index 6f5c4958b..413968b9b 100644 --- a/gio/gsocketaddress.c +++ b/gio/gsocketaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketaddress.h b/gio/gsocketaddress.h index 95e86d5ec..ca2dbdae2 100644 --- a/gio/gsocketaddress.h +++ b/gio/gsocketaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketaddressenumerator.c b/gio/gsocketaddressenumerator.c index 06ea72483..03b1502c6 100644 --- a/gio/gsocketaddressenumerator.c +++ b/gio/gsocketaddressenumerator.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketaddressenumerator.h b/gio/gsocketaddressenumerator.h index 78fd9c8e9..d11b7e482 100644 --- a/gio/gsocketaddressenumerator.h +++ b/gio/gsocketaddressenumerator.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c index 94212bf1f..ddd149734 100644 --- a/gio/gsocketclient.c +++ b/gio/gsocketclient.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketclient.h b/gio/gsocketclient.h index f192d8a9e..f0153450d 100644 --- a/gio/gsocketclient.h +++ b/gio/gsocketclient.h @@ -3,10 +3,10 @@ * Copyright © 2008, 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketconnectable.c b/gio/gsocketconnectable.c index 7554e34d8..76f349faf 100644 --- a/gio/gsocketconnectable.c +++ b/gio/gsocketconnectable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketconnectable.h b/gio/gsocketconnectable.h index 25805b722..6a92dac39 100644 --- a/gio/gsocketconnectable.h +++ b/gio/gsocketconnectable.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c index 63d974dde..5fab8f4f7 100644 --- a/gio/gsocketconnection.c +++ b/gio/gsocketconnection.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h index 8d20068f8..bc7a07600 100644 --- a/gio/gsocketconnection.h +++ b/gio/gsocketconnection.h @@ -2,10 +2,10 @@ * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketcontrolmessage.c b/gio/gsocketcontrolmessage.c index e78a86c23..7acf6b358 100644 --- a/gio/gsocketcontrolmessage.c +++ b/gio/gsocketcontrolmessage.c @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gsocketcontrolmessage.h b/gio/gsocketcontrolmessage.h index ae6989242..a4a5d0194 100644 --- a/gio/gsocketcontrolmessage.h +++ b/gio/gsocketcontrolmessage.h @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketinputstream.c b/gio/gsocketinputstream.c index 325428b16..b6d5c62da 100644 --- a/gio/gsocketinputstream.c +++ b/gio/gsocketinputstream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketinputstream.h b/gio/gsocketinputstream.h index 8e5776fef..f415f1ba9 100644 --- a/gio/gsocketinputstream.h +++ b/gio/gsocketinputstream.h @@ -3,10 +3,10 @@ * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gsocketlistener.c b/gio/gsocketlistener.c index 8790e68b5..df6b71b0d 100644 --- a/gio/gsocketlistener.c +++ b/gio/gsocketlistener.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketlistener.h b/gio/gsocketlistener.h index abf064a06..687fab3d4 100644 --- a/gio/gsocketlistener.h +++ b/gio/gsocketlistener.h @@ -4,10 +4,10 @@ * Copyright © 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketoutputstream.c b/gio/gsocketoutputstream.c index 00b49ade3..de1f4226b 100644 --- a/gio/gsocketoutputstream.c +++ b/gio/gsocketoutputstream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketoutputstream.h b/gio/gsocketoutputstream.h index e3514d1b2..0cbaa6372 100644 --- a/gio/gsocketoutputstream.h +++ b/gio/gsocketoutputstream.h @@ -3,10 +3,10 @@ * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gsocketservice.c b/gio/gsocketservice.c index 57113a00f..1ac31d505 100644 --- a/gio/gsocketservice.c +++ b/gio/gsocketservice.c @@ -3,10 +3,10 @@ * Copyright © 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocketservice.h b/gio/gsocketservice.h index a30b348de..f25a1b6b7 100644 --- a/gio/gsocketservice.h +++ b/gio/gsocketservice.h @@ -3,10 +3,10 @@ * Copyright © 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks4aproxy.c b/gio/gsocks4aproxy.c index 8fabdd30a..988ddaf56 100644 --- a/gio/gsocks4aproxy.c +++ b/gio/gsocks4aproxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks4aproxy.h b/gio/gsocks4aproxy.h index ab22b853b..d32662192 100644 --- a/gio/gsocks4aproxy.h +++ b/gio/gsocks4aproxy.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks4proxy.c b/gio/gsocks4proxy.c index b9661417e..ad176ffaf 100644 --- a/gio/gsocks4proxy.c +++ b/gio/gsocks4proxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks4proxy.h b/gio/gsocks4proxy.h index 715827b30..59cc99ed9 100644 --- a/gio/gsocks4proxy.h +++ b/gio/gsocks4proxy.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c index dfe45c179..c58be8369 100644 --- a/gio/gsocks5proxy.c +++ b/gio/gsocks5proxy.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsocks5proxy.h b/gio/gsocks5proxy.h index 711f5d6c8..1d294aea2 100644 --- a/gio/gsocks5proxy.h +++ b/gio/gsocks5proxy.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsrvtarget.c b/gio/gsrvtarget.c index 232da5a34..6b4068ba4 100644 --- a/gio/gsrvtarget.c +++ b/gio/gsrvtarget.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsrvtarget.h b/gio/gsrvtarget.h index 8d400e9e9..3ef16f139 100644 --- a/gio/gsrvtarget.h +++ b/gio/gsrvtarget.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c index bbfa522b5..e3c43b04e 100644 --- a/gio/gsubprocess.c +++ b/gio/gsubprocess.c @@ -3,10 +3,10 @@ * Copyright © 2012, 2013 Red Hat, Inc. * Copyright © 2012, 2013 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gsubprocess.h b/gio/gsubprocess.h index 3f3de7d3c..68bb26aab 100644 --- a/gio/gsubprocess.h +++ b/gio/gsubprocess.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsubprocesslauncher-private.h b/gio/gsubprocesslauncher-private.h index 2b693353d..64374a02d 100644 --- a/gio/gsubprocesslauncher-private.h +++ b/gio/gsubprocesslauncher-private.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c index 654de4d3f..5cdec4d4e 100644 --- a/gio/gsubprocesslauncher.c +++ b/gio/gsubprocesslauncher.c @@ -3,10 +3,10 @@ * Copyright © 2012 Red Hat, Inc. * Copyright © 2012-2013 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * @@ -240,8 +240,12 @@ g_subprocess_launcher_new (GSubprocessFlags flags) * As an alternative, you can use g_subprocess_launcher_setenv(), * g_subprocess_launcher_unsetenv(), etc. * - * Pass %NULL to inherit the parent process' environment. Pass an - * empty array to set an empty environment. + * Pass an empty array to set an empty environment. Pass %NULL to inherit the + * parent process’ environment. As of GLib 2.54, the parent process’ environment + * will be copied when g_subprocess_launcher_set_environ() is called. + * Previously, it was copied when the subprocess was executed. This means the + * copied environment may now be modified (using g_subprocess_launcher_setenv(), + * etc.) before launching the subprocess. * * On UNIX, all strings in this array can be arbitrary byte strings. * On Windows, they should be in UTF-8. @@ -254,6 +258,9 @@ g_subprocess_launcher_set_environ (GSubprocessLauncher *self, { g_strfreev (self->envp); self->envp = g_strdupv (env); + + if (self->envp == NULL) + self->envp = g_get_environ (); } /** diff --git a/gio/gsubprocesslauncher.h b/gio/gsubprocesslauncher.h index 68317c2b3..05d83f131 100644 --- a/gio/gsubprocesslauncher.h +++ b/gio/gsubprocesslauncher.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtask.c b/gio/gtask.c index 5a2767473..7eb018560 100644 --- a/gio/gtask.c +++ b/gio/gtask.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtask.h b/gio/gtask.h index 446c85b4d..92cd2b144 100644 --- a/gio/gtask.h +++ b/gio/gtask.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtcpconnection.c b/gio/gtcpconnection.c index 9660a8947..68ed1e188 100644 --- a/gio/gtcpconnection.c +++ b/gio/gtcpconnection.c @@ -2,10 +2,10 @@ * * Copyright © 2008, 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/gio/gtcpconnection.h b/gio/gtcpconnection.h index 5d4e71315..39645f914 100644 --- a/gio/gtcpconnection.h +++ b/gio/gtcpconnection.h @@ -2,10 +2,10 @@ * * Copyright © 2008, 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtcpwrapperconnection.c b/gio/gtcpwrapperconnection.c index 18eae3dd0..9c00869da 100644 --- a/gio/gtcpwrapperconnection.c +++ b/gio/gtcpwrapperconnection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtcpwrapperconnection.h b/gio/gtcpwrapperconnection.h index adf07c912..a32acad79 100644 --- a/gio/gtcpwrapperconnection.h +++ b/gio/gtcpwrapperconnection.h @@ -1,10 +1,10 @@ /* GIO - GLib Input, Output and Streaming Library * Copyright © 2010 Collabora Ltd. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c index 1d17cf452..609605290 100644 --- a/gio/gtestdbus.c +++ b/gio/gtestdbus.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtestdbus.h b/gio/gtestdbus.h index 0e82e33e8..9467f59ae 100644 --- a/gio/gtestdbus.h +++ b/gio/gtestdbus.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c index e1fc74cfe..3ada77b6c 100644 --- a/gio/gthemedicon.c +++ b/gio/gthemedicon.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h index afe679658..3a145b5c3 100644 --- a/gio/gthemedicon.h +++ b/gio/gthemedicon.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c index 6b3b1f088..7fa266aa5 100644 --- a/gio/gthreadedresolver.c +++ b/gio/gthreadedresolver.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthreadedresolver.h b/gio/gthreadedresolver.h index 9509a48ac..395d850c8 100644 --- a/gio/gthreadedresolver.h +++ b/gio/gthreadedresolver.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthreadedsocketservice.c b/gio/gthreadedsocketservice.c index c22d08b9a..e0c111c10 100644 --- a/gio/gthreadedsocketservice.c +++ b/gio/gthreadedsocketservice.c @@ -3,10 +3,10 @@ * Copyright © 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gthreadedsocketservice.h b/gio/gthreadedsocketservice.h index 6b0168f82..fa3204f95 100644 --- a/gio/gthreadedsocketservice.h +++ b/gio/gthreadedsocketservice.h @@ -3,10 +3,10 @@ * Copyright © 2009 Codethink Limited * Copyright © 2009 Red Hat, Inc * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsbackend.c b/gio/gtlsbackend.c index ca0e0906c..a78d84be7 100644 --- a/gio/gtlsbackend.c +++ b/gio/gtlsbackend.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsbackend.h b/gio/gtlsbackend.h index e6fc9f3dd..a75036fec 100644 --- a/gio/gtlsbackend.h +++ b/gio/gtlsbackend.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c index 7c6ce076d..9e497c58b 100644 --- a/gio/gtlscertificate.c +++ b/gio/gtlscertificate.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlscertificate.h b/gio/gtlscertificate.h index d0c727be9..a064543c4 100644 --- a/gio/gtlscertificate.h +++ b/gio/gtlscertificate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsclientconnection.c b/gio/gtlsclientconnection.c index 5f5619925..0fc188c3a 100644 --- a/gio/gtlsclientconnection.c +++ b/gio/gtlsclientconnection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsclientconnection.h b/gio/gtlsclientconnection.h index ae50f84ba..84711ec0b 100644 --- a/gio/gtlsclientconnection.h +++ b/gio/gtlsclientconnection.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c index 11f10d2fb..e13d98614 100644 --- a/gio/gtlsconnection.c +++ b/gio/gtlsconnection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsconnection.h b/gio/gtlsconnection.h index 15b29aa86..9c038e29e 100644 --- a/gio/gtlsconnection.h +++ b/gio/gtlsconnection.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c index 098b1e99c..424d9c178 100644 --- a/gio/gtlsdatabase.c +++ b/gio/gtlsdatabase.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsdatabase.h b/gio/gtlsdatabase.h index 34a8d3b97..5dafd7bc0 100644 --- a/gio/gtlsdatabase.h +++ b/gio/gtlsdatabase.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsfiledatabase.c b/gio/gtlsfiledatabase.c index d07c702fe..75c01338e 100644 --- a/gio/gtlsfiledatabase.c +++ b/gio/gtlsfiledatabase.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsfiledatabase.h b/gio/gtlsfiledatabase.h index 502494928..1ee4631be 100644 --- a/gio/gtlsfiledatabase.h +++ b/gio/gtlsfiledatabase.h @@ -2,10 +2,10 @@ * * Copyright © 2010 Collabora, Ltd. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c index eaaaa1642..85e2e5afc 100644 --- a/gio/gtlsinteraction.c +++ b/gio/gtlsinteraction.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsinteraction.h b/gio/gtlsinteraction.h index 99d7274c7..03552fb14 100644 --- a/gio/gtlsinteraction.h +++ b/gio/gtlsinteraction.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c index a64faa464..27364b1be 100644 --- a/gio/gtlspassword.c +++ b/gio/gtlspassword.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -110,7 +110,9 @@ g_tls_password_real_get_default_warning (GTlsPassword *password) if (flags & G_TLS_PASSWORD_FINAL_TRY) return _("This is the last chance to enter the password correctly before your access is locked out."); if (flags & G_TLS_PASSWORD_MANY_TRIES) - return _("Several password entered have been incorrect, and your access will be locked out after further failures."); + /* Translators: This is not the 'This is the last chance' string. It is + * displayed when more than one attempt is allowed. */ + return _("Several passwords entered have been incorrect, and your access will be locked out after further failures."); if (flags & G_TLS_PASSWORD_RETRY) return _("The password entered is incorrect."); diff --git a/gio/gtlspassword.h b/gio/gtlspassword.h index 1b5786839..befe706a8 100644 --- a/gio/gtlspassword.h +++ b/gio/gtlspassword.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsserverconnection.c b/gio/gtlsserverconnection.c index d1e488b7e..dde9a83d9 100644 --- a/gio/gtlsserverconnection.c +++ b/gio/gtlsserverconnection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gtlsserverconnection.h b/gio/gtlsserverconnection.h index ad61e30fc..6926e7d12 100644 --- a/gio/gtlsserverconnection.h +++ b/gio/gtlsserverconnection.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 2394d4add..8e58d18ed 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunionvolumemonitor.h b/gio/gunionvolumemonitor.h index fc1d6fa5f..5e4c5449f 100644 --- a/gio/gunionvolumemonitor.h +++ b/gio/gunionvolumemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c index 16245f182..1647d3601 100644 --- a/gio/gunixconnection.c +++ b/gio/gunixconnection.c @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gunixconnection.h b/gio/gunixconnection.h index 95d8997dd..620c72b9b 100644 --- a/gio/gunixconnection.h +++ b/gio/gunixconnection.h @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixcredentialsmessage.c b/gio/gunixcredentialsmessage.c index 77612f132..02d59c858 100644 --- a/gio/gunixcredentialsmessage.c +++ b/gio/gunixcredentialsmessage.c @@ -3,10 +3,10 @@ * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gunixcredentialsmessage.h b/gio/gunixcredentialsmessage.h index f6cb4e807..2f3ad7582 100644 --- a/gio/gunixcredentialsmessage.h +++ b/gio/gunixcredentialsmessage.h @@ -3,10 +3,10 @@ * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixfdlist.c b/gio/gunixfdlist.c index 7c3fc6a97..6cb7df684 100644 --- a/gio/gunixfdlist.c +++ b/gio/gunixfdlist.c @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gunixfdlist.h b/gio/gunixfdlist.h index d159dbb57..9d3204a7d 100644 --- a/gio/gunixfdlist.h +++ b/gio/gunixfdlist.h @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c index f3b303cf0..581670328 100644 --- a/gio/gunixfdmessage.c +++ b/gio/gunixfdmessage.c @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/gunixfdmessage.h b/gio/gunixfdmessage.h index 035166ba2..c766e2a69 100644 --- a/gio/gunixfdmessage.h +++ b/gio/gunixfdmessage.h @@ -2,10 +2,10 @@ * * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c index 3cfb62ab6..defa05223 100644 --- a/gio/gunixinputstream.c +++ b/gio/gunixinputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h index 002fff28e..1fba553b1 100644 --- a/gio/gunixinputstream.h +++ b/gio/gunixinputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixmount.c b/gio/gunixmount.c index 278d1f4b4..0a6d7f3bf 100644 --- a/gio/gunixmount.c +++ b/gio/gunixmount.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixmount.h b/gio/gunixmount.h index c2a40a624..9faaf6411 100644 --- a/gio/gunixmount.h +++ b/gio/gunixmount.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 7ad7aafb3..2ccd9f75d 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h index bce464a3f..853b16182 100644 --- a/gio/gunixmounts.h +++ b/gio/gunixmounts.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c index 36b3d3951..0a04f111d 100644 --- a/gio/gunixoutputstream.c +++ b/gio/gunixoutputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h index 30c0962cb..2d1d76888 100644 --- a/gio/gunixoutputstream.h +++ b/gio/gunixoutputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixsocketaddress.c b/gio/gunixsocketaddress.c index 3b2a1c486..b0d3c8fe4 100644 --- a/gio/gunixsocketaddress.c +++ b/gio/gunixsocketaddress.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixsocketaddress.h b/gio/gunixsocketaddress.h index e5650914a..1c1df1436 100644 --- a/gio/gunixsocketaddress.h +++ b/gio/gunixsocketaddress.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c index 6b58f23e0..7abdb4458 100644 --- a/gio/gunixvolume.c +++ b/gio/gunixvolume.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixvolume.h b/gio/gunixvolume.h index 67a74b717..e7b4615cc 100644 --- a/gio/gunixvolume.h +++ b/gio/gunixvolume.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c index b0508c951..b7711ff52 100644 --- a/gio/gunixvolumemonitor.c +++ b/gio/gunixvolumemonitor.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gunixvolumemonitor.h b/gio/gunixvolumemonitor.h index f7dfd0a3e..4f54fc23c 100644 --- a/gio/gunixvolumemonitor.h +++ b/gio/gunixvolumemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvdb/gvdb-builder.c b/gio/gvdb/gvdb-builder.c index 43ad06869..8b9baa007 100644 --- a/gio/gvdb/gvdb-builder.c +++ b/gio/gvdb/gvdb-builder.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvdb/gvdb-builder.h b/gio/gvdb/gvdb-builder.h index 8ec05c8be..b4815f0d0 100644 --- a/gio/gvdb/gvdb-builder.h +++ b/gio/gvdb/gvdb-builder.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvdb/gvdb-format.h b/gio/gvdb/gvdb-format.h index 486e85474..ed6adabfa 100644 --- a/gio/gvdb/gvdb-format.h +++ b/gio/gvdb/gvdb-format.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvdb/gvdb-reader.c b/gio/gvdb/gvdb-reader.c index 1b80e7004..510eba205 100644 --- a/gio/gvdb/gvdb-reader.c +++ b/gio/gvdb/gvdb-reader.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvdb/gvdb-reader.h b/gio/gvdb/gvdb-reader.h index 08a160506..449241eaa 100644 --- a/gio/gvdb/gvdb-reader.h +++ b/gio/gvdb/gvdb-reader.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvfs.c b/gio/gvfs.c index 0634f1c12..5805a7904 100644 --- a/gio/gvfs.c +++ b/gio/gvfs.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvfs.h b/gio/gvfs.h index 7b2969c9c..46ad792c8 100644 --- a/gio/gvfs.h +++ b/gio/gvfs.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvolume.c b/gio/gvolume.c index 3f08ebc1d..67a70a924 100644 --- a/gio/gvolume.c +++ b/gio/gvolume.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvolume.h b/gio/gvolume.h index c9421b1c9..c4a506e84 100644 --- a/gio/gvolume.h +++ b/gio/gvolume.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c index f6da0c05d..cc8d917b9 100644 --- a/gio/gvolumemonitor.c +++ b/gio/gvolumemonitor.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 1ee3a7e20..899942f6c 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c index b547012b6..499bbb351 100644 --- a/gio/gwin32appinfo.c +++ b/gio/gwin32appinfo.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32appinfo.h b/gio/gwin32appinfo.h index 16c1181b2..5d463caf0 100644 --- a/gio/gwin32appinfo.h +++ b/gio/gwin32appinfo.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32inputstream.c b/gio/gwin32inputstream.c index bd69730de..5649af145 100644 --- a/gio/gwin32inputstream.c +++ b/gio/gwin32inputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32inputstream.h b/gio/gwin32inputstream.h index 44f97b6d1..c6d8d9a82 100644 --- a/gio/gwin32inputstream.h +++ b/gio/gwin32inputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c index b3d51ef8c..5b4847a9d 100644 --- a/gio/gwin32mount.c +++ b/gio/gwin32mount.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32mount.h b/gio/gwin32mount.h index 4de3762e1..4eef3ef32 100644 --- a/gio/gwin32mount.h +++ b/gio/gwin32mount.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32networking.h b/gio/gwin32networking.h index 086114edf..9e1396cc6 100644 --- a/gio/gwin32networking.h +++ b/gio/gwin32networking.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32outputstream.c b/gio/gwin32outputstream.c index 083746c15..b5f70c988 100644 --- a/gio/gwin32outputstream.c +++ b/gio/gwin32outputstream.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32outputstream.h b/gio/gwin32outputstream.h index c30896516..9045da8d9 100644 --- a/gio/gwin32outputstream.h +++ b/gio/gwin32outputstream.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c index 096e96cba..c19fede4e 100644 --- a/gio/gwin32registrykey.c +++ b/gio/gwin32registrykey.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -89,18 +89,18 @@ typedef NTSTATUS PULONG result_size); typedef NTSTATUS -(* NtNotifyChangeMultipleKeysFunc)(HANDLE key_handle, - ULONG subkey_count, - POBJECT_ATTRIBUTES subkeys, - HANDLE event, - PIO_APC_ROUTINE apc_routine, - PVOID apc_closure, - PIO_STATUS_BLOCK status_block, - ULONG filter, - BOOLEAN watch_tree, - PVOID buffer, - ULONG buffer_size, - BOOLEAN async); +(NTAPI * NtNotifyChangeMultipleKeysFunc)(HANDLE key_handle, + ULONG subkey_count, + POBJECT_ATTRIBUTES subkeys, + HANDLE event, + PIO_APC_ROUTINE apc_routine, + PVOID apc_closure, + PIO_STATUS_BLOCK status_block, + ULONG filter, + BOOLEAN watch_tree, + PVOID buffer, + ULONG buffer_size, + BOOLEAN async); static NtQueryKeyFunc nt_query_key = NULL; static NtNotifyChangeMultipleKeysFunc nt_notify_change_multiple_keys = NULL; diff --git a/gio/gwin32registrykey.h b/gio/gwin32registrykey.h index 1a0b0f094..52ccd5c0f 100644 --- a/gio/gwin32registrykey.h +++ b/gio/gwin32registrykey.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32volumemonitor.c b/gio/gwin32volumemonitor.c index ce8aaf701..c9db68a8a 100644 --- a/gio/gwin32volumemonitor.c +++ b/gio/gwin32volumemonitor.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gwin32volumemonitor.h b/gio/gwin32volumemonitor.h index 49bd6effd..8c036dd53 100644 --- a/gio/gwin32volumemonitor.h +++ b/gio/gwin32volumemonitor.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gzlibcompressor.c b/gio/gzlibcompressor.c index 5e89017ad..239d143cc 100644 --- a/gio/gzlibcompressor.c +++ b/gio/gzlibcompressor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gzlibcompressor.h b/gio/gzlibcompressor.h index 4bda6931a..f89b30f20 100644 --- a/gio/gzlibcompressor.h +++ b/gio/gzlibcompressor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gzlibdecompressor.c b/gio/gzlibdecompressor.c index 0f1da62c3..d16d3f717 100644 --- a/gio/gzlibdecompressor.c +++ b/gio/gzlibdecompressor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/gzlibdecompressor.h b/gio/gzlibdecompressor.h index ac47d7019..373ac67d1 100644 --- a/gio/gzlibdecompressor.h +++ b/gio/gzlibdecompressor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/inotify/ginotifyfilemonitor.c b/gio/inotify/ginotifyfilemonitor.c index 15a113139..9bd19d0c1 100644 --- a/gio/inotify/ginotifyfilemonitor.c +++ b/gio/inotify/ginotifyfilemonitor.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/inotify/ginotifyfilemonitor.h b/gio/inotify/ginotifyfilemonitor.h index 2ff8de8b8..2b40ff2f6 100644 --- a/gio/inotify/ginotifyfilemonitor.h +++ b/gio/inotify/ginotifyfilemonitor.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c index 13acd25ae..dce57e507 100644 --- a/gio/inotify/inotify-helper.c +++ b/gio/inotify/inotify-helper.c @@ -5,16 +5,16 @@ Copyright (C) 2007 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: diff --git a/gio/inotify/inotify-helper.h b/gio/inotify/inotify-helper.h index 7e3ce1c31..340f33d39 100644 --- a/gio/inotify/inotify-helper.h +++ b/gio/inotify/inotify-helper.h @@ -3,16 +3,16 @@ Copyright (C) 2007 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <john@johnmccutchan.com> diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c index da177f30f..67584805a 100644 --- a/gio/inotify/inotify-kernel.c +++ b/gio/inotify/inotify-kernel.c @@ -3,16 +3,16 @@ Copyright © 2015 Canonical Limited This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: diff --git a/gio/inotify/inotify-kernel.h b/gio/inotify/inotify-kernel.h index c3e78bf4b..c11cd7cdf 100644 --- a/gio/inotify/inotify-kernel.h +++ b/gio/inotify/inotify-kernel.h @@ -2,16 +2,16 @@ Copyright (C) 2005 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors:. diff --git a/gio/inotify/inotify-missing.c b/gio/inotify/inotify-missing.c index cac9a14f3..b71b2d339 100644 --- a/gio/inotify/inotify-missing.c +++ b/gio/inotify/inotify-missing.c @@ -5,16 +5,16 @@ Copyright (C) 2005 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: diff --git a/gio/inotify/inotify-missing.h b/gio/inotify/inotify-missing.h index e47aad9df..f0ccdce35 100644 --- a/gio/inotify/inotify-missing.h +++ b/gio/inotify/inotify-missing.h @@ -3,16 +3,16 @@ Copyright (C) 2006 John McCutchan <john@johnmccutchan.com> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <ttb@tentacle.dhs.org> diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c index b7e5135c6..5110dff45 100644 --- a/gio/inotify/inotify-path.c +++ b/gio/inotify/inotify-path.c @@ -6,16 +6,16 @@ Copyright (C) 2009 Codethink Limited This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: diff --git a/gio/inotify/inotify-path.h b/gio/inotify/inotify-path.h index 91b891f55..26f6dfd8b 100644 --- a/gio/inotify/inotify-path.h +++ b/gio/inotify/inotify-path.h @@ -2,16 +2,16 @@ Copyright (C) 2005 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors:. diff --git a/gio/inotify/inotify-sub.c b/gio/inotify/inotify-sub.c index 4220064d6..feb63fae2 100644 --- a/gio/inotify/inotify-sub.c +++ b/gio/inotify/inotify-sub.c @@ -5,16 +5,16 @@ Copyright (C) 2006 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Authors: diff --git a/gio/inotify/inotify-sub.h b/gio/inotify/inotify-sub.h index d1a913638..b0844fd99 100644 --- a/gio/inotify/inotify-sub.h +++ b/gio/inotify/inotify-sub.h @@ -3,16 +3,16 @@ Copyright (C) 2006 John McCutchan This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public License + You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. Author: John McCutchan <john@johnmccutchan.com> diff --git a/gio/org.freedesktop.portal.Documents.xml b/gio/org.freedesktop.portal.Documents.xml index 92eabf907..d1cb73912 100644 --- a/gio/org.freedesktop.portal.Documents.xml +++ b/gio/org.freedesktop.portal.Documents.xml @@ -8,30 +8,86 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Lesser General + Public License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. Author: Alexander Larsson <alexl@redhat.com> --> <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> + <!-- + org.freedesktop.portal.Documents: + @short_description: Document portal + + The document portal allows to make files from the outside world + available to sandboxed applications in a controlled way. + + Exported files will be made accessible to the application via + a fuse filesystem that gets mounted at /run/user/$UID/doc/. The + filesystem gets mounted both outside and inside the sandbox, but + the view inside the sandbox is restricted to just those files + that the application is allowed to access. + + Individual files will appear at /run/user/$UID/doc/$DOC_ID/filename, + where $DOC_ID is the ID of the file in the document store. It is + returned by the org.freedesktop.portal.Documents.Add() and + org.freedesktop.portal.Documents.AddNamed() calls. + + The permissions that the application has for a document store entry + (see org.freedesktop.portal.Documents.GrantPermissions()) are reflected + in the POSIX mode bits in the fuse filesystem. + --> <interface name='org.freedesktop.portal.Documents'> + <property name="version" type="u" access="read"/> + + <!-- + GetMountPoint: + @path: the path at which the fuse filesystem is mounted + + Returns the path at which the document store fuse filesystem + is mounted. This will typically be /run/user/$UID/doc/. + --> <method name="GetMountPoint"> <arg type='ay' name='path' direction='out'/> </method> + + <!-- + Add: + @o_path_fd: open file descriptor for the file to add + @reuse_existing: whether to reuse an existing document store entry for the file + @persistent: whether to add the file only for this session or permanently + @doc_id: the ID of the file in the document store + + Adds a file to the document store. The file is passed in the + form of an open file descriptor to prove that the caller has + access to the file. + --> <method name="Add"> <arg type='h' name='o_path_fd' direction='in'/> <arg type='b' name='reuse_existing' direction='in'/> <arg type='b' name='persistent' direction='in'/> <arg type='s' name='doc_id' direction='out'/> </method> + + <!-- + AddNamed: + @o_path_parent_fd: open file descriptor for the parent directory + @filename: the basename for the file + @reuse_existing: whether to reuse an existing document store entry for the file + @persistent: whether to add the file only for this session or permanently + @doc_id: the ID of the file in the document store + + Creates an entry in the document store for writing a new file. + --> <method name="AddNamed"> <arg type='h' name='o_path_parent_fd' direction='in'/> <arg type='ay' name='filename' direction='in'/> @@ -39,28 +95,129 @@ <arg type='b' name='persistent' direction='in'/> <arg type='s' name='doc_id' direction='out'/> </method> + + <!-- + AddFull: + @o_path_fds: open file descriptors for the files to export + @flags: flags, 1 == reuse_existing, 2 == persistent + @app_id: an application ID, or empty string + @permissions: the permissions to grant, possible values are 'read', 'write', 'grant-permissions' and 'delete' + @doc_ids: the IDs of the files in the document store + @extra_info: Extra info returned + + Adds multiple files to the document store. The file is passed in the + form of an open file descriptor to prove that the caller has + access to the file. + + Additionally, if app_id is specified, it will be given the permissions + listed in GrantPermission. + + The method also returns some extra info that can be used to avoid + multiple roundtrips. For now it only contains as "mountpoint", the + fuse mountpoint of the document portal. + + This method was added in version 2 of the org.freedesktop.portal.Documents interface. + --> + <method name="AddFull"> + <arg type='ah' name='o_path_fds' direction='in'/> + <arg type='u' name='flags' direction='in'/> + <arg type='s' name='app_id' direction='in'/> + <arg type='as' name='permissions' direction='in'/> + <arg type='as' name='doc_ids' direction='out'/> + <arg type='a{sv}' name='extra_out' direction='out'/> + </method> + + <!-- + GrantPermissions: + @doc_id: the ID of the file in the document store + @app_id: the ID of the application to which permissions are granted + @permissions: the permissions to grant, possible values are 'read', 'write', 'grant-permissions' and 'delete' + + Grants access permissions for a file in the document store + to an application. + + This call is available inside the sandbox if the application + has the 'grant-permissions' permission for the document. + --> <method name="GrantPermissions"> <arg type='s' name='doc_id' direction='in'/> <arg type='s' name='app_id' direction='in'/> <arg type='as' name='permissions' direction='in'/> </method> + + <!-- + RevokePermissions: + @doc_id: the ID of the file in the document store + @app_id: the ID of the application to which permissions are granted + @permissions: the permissions to grant, possible values are 'read', 'write', 'grant-permissions' and 'delete' + + Revokes access permissions for a file in the document store + from an application. + + This call is available inside the sandbox if the application + has the 'grant-permissions' permission for the document. + --> <method name="RevokePermissions"> <arg type='s' name='doc_id' direction='in'/> <arg type='s' name='app_id' direction='in'/> <arg type='as' name='permissions' direction='in'/> </method> + + <!-- + Delete: + @doc_id: the ID of the file in the document store + + Removes an entry from the document store. The file itself is + not deleted. + + This call is available inside the sandbox if the application + has the 'delete' permission for the document. + --> <method name="Delete"> <arg type='s' name='doc_id' direction='in'/> </method> + + <!-- + Lookup: + @filename: a path in the host filesystem + @doc_id: the ID of the file in the document store, or '' if the file is not in the document store + + Looks up the document ID for a file. + + This call is no not available inside the sandbox. + --> <method name="Lookup"> <arg type='ay' name='filename' direction='in'/> <arg type='s' name='doc_id' direction='out'/> </method> + + <!-- + Info: + @doc_id: the ID of the file in the document store + @path: the path for the file in the host filesystem + @apps: a dictionary mapping application IDs to the permissions for that application + + Gets the filesystem path and application permissions for a document store + entry. + + This call is not available inside the sandbox. + --> <method name="Info"> <arg type='s' name='doc_id' direction='in'/> <arg type='ay' name='path' direction='out'/> <arg type='a{sas}' name='apps' direction='out'/> </method> + + <!-- + List: + @app_id: an application ID, or '' to list all documents + @docs: a dictonary mapping document IDs to their filesystem path + + Lists documents in the document store for an application (or for + all applications). + + This call is not available inside the sandbox. + --> <method name="List"> <arg type='s' name='app_id' direction='in'/> <arg type='a{say}' name='docs' direction='out'/> diff --git a/gio/org.freedesktop.portal.NetworkMonitor.xml b/gio/org.freedesktop.portal.NetworkMonitor.xml index 3022208b1..8d3a471d5 100644 --- a/gio/org.freedesktop.portal.NetworkMonitor.xml +++ b/gio/org.freedesktop.portal.NetworkMonitor.xml @@ -5,7 +5,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/org.freedesktop.portal.OpenURI.xml b/gio/org.freedesktop.portal.OpenURI.xml new file mode 100644 index 000000000..0cc79d1cc --- /dev/null +++ b/gio/org.freedesktop.portal.OpenURI.xml @@ -0,0 +1,105 @@ +<?xml version="1.0"?> +<!-- + Copyright (C) 2016 Red Hat, Inc. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. + + Author: Matthias Clasen <mclasen@redhat.com> +--> + +<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"> + <!-- + org.freedesktop.portal.OpenURI: + @short_description: Portal for opening URIs + + The OpenURI portal allows sandboxed applications to open + URIs (e.g. a http: link to the applications homepage) + under the control of the user. + --> + <interface name="org.freedesktop.portal.OpenURI"> + <!-- + OpenURI: + @parent_window: Identifier for the application window + @uri: The uri to open + @options: Vardict with optional further onformation + @handle: Object path for the #org.freedesktop.portal.Request object representing this call + + Asks to open a uri. + + The @parent_window identifier must be of the form "x11:$XID" for an X11 + window. Support for other window systems may be added in the future. + + Note that file:// uris are explicitly not supported by this method. + To request opening local files, use org.freedesktop.portal.OpenFile(). + + Supported keys in the @options vardict include: + <variablelist> + <varlistentry> + <term>writable b</term> + <listitem><para> + Whether to allow the chosen application to write to the file. + </para><para> + This key only takes effect the uri points to a local file that + is exported in the document portal, and the chosen application + is sandboxed itself. + </para></listitem> + </varlistentry> + </variablelist> + + --> + <method name="OpenURI"> + <arg type="s" name="parent_window" direction="in"/> + <arg type="s" name="uri" direction="in"/> + <arg type="a{sv}" name="options" direction="in"/> + <arg type="o" name="handle" direction="out"/> + </method> + + <!-- + OpenFile: + @parent_window: Identifier for the application window + @fd: File descriptor for the file to open + @options: Vardict with optional further onformation + @handle: Object path for the #org.freedesktop.portal.Request object representing this call + + Asks to open a local file. + + The @parent_window identifier must be of the form "x11:$XID" for an X11 + window. Support for other window systems may be added in the future. + + Supported keys in the @options vardict include: + <variablelist> + <varlistentry> + <term>writable b</term> + <listitem><para> + Whether to allow the chosen application to write to the file. + </para><para> + This key only takes effect the uri points to a local file that + is exported in the document portal, and the chosen application + is sandboxed itself. + </para></listitem> + </varlistentry> + </variablelist> + + The OpenFile method was introduced in version 2 of the OpenURI portal API. + --> + <method name="OpenFile"> + <arg type="s" name="parent_window" direction="in"/> + <arg type="h" name="fd" direction="in"/> + <arg type="a{sv}" name="options" direction="in"/> + <arg type="o" name="handle" direction="out"/> + </method> + + <property name="version" type="u" access="read"/> + </interface> +</node> diff --git a/gio/org.freedesktop.portal.ProxyResolver.xml b/gio/org.freedesktop.portal.ProxyResolver.xml index 0b98b805a..c6e9ce9a2 100644 --- a/gio/org.freedesktop.portal.ProxyResolver.xml +++ b/gio/org.freedesktop.portal.ProxyResolver.xml @@ -5,7 +5,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/strinfo.c b/gio/strinfo.c index d0f6488de..cd47215da 100644 --- a/gio/strinfo.c +++ b/gio/strinfo.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/Makefile.in b/gio/tests/Makefile.in index dfbabcb2c..2f0a55eb2 100644 --- a/gio/tests/Makefile.in +++ b/gio/tests/Makefile.in @@ -2123,7 +2123,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ G_TEST_BUILDDIR="$(abs_builddir)" \ G_DEBUG=gc-friendly \ diff --git a/gio/tests/cancellable.c b/gio/tests/cancellable.c index 1cbd765cc..e06650ed8 100644 --- a/gio/tests/cancellable.c +++ b/gio/tests/cancellable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/dbus-appinfo.c b/gio/tests/dbus-appinfo.c index 2f5e6918b..ee73d5833 100644 --- a/gio/tests/dbus-appinfo.c +++ b/gio/tests/dbus-appinfo.c @@ -1,10 +1,10 @@ /* * Copyright © 2013 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/dbus-launch.c b/gio/tests/dbus-launch.c index fa830656e..97bb89c84 100644 --- a/gio/tests/dbus-launch.c +++ b/gio/tests/dbus-launch.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/defaultvalue.c b/gio/tests/defaultvalue.c index 965402b3d..3225dbba4 100644 --- a/gio/tests/defaultvalue.c +++ b/gio/tests/defaultvalue.c @@ -2,17 +2,17 @@ * Copyright (C) 2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include <string.h> diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c index 5f34ed1a0..5fcb5c2e6 100644 --- a/gio/tests/desktop-app-info.c +++ b/gio/tests/desktop-app-info.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/filter-cat.c b/gio/tests/filter-cat.c index 320aebd91..2cd02b7a2 100644 --- a/gio/tests/filter-cat.c +++ b/gio/tests/filter-cat.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/filter-streams.c b/gio/tests/filter-streams.c index dd83ac8e5..e3e67ea18 100644 --- a/gio/tests/filter-streams.c +++ b/gio/tests/filter-streams.c @@ -1,10 +1,10 @@ /* * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/tests/gdbus-addresses.c b/gio/tests/gdbus-addresses.c index 96d07e1b8..2e662d000 100644 --- a/gio/tests/gdbus-addresses.c +++ b/gio/tests/gdbus-addresses.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c index da9b20751..f44e932e2 100644 --- a/gio/tests/gdbus-auth.c +++ b/gio/tests/gdbus-auth.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-bz627724.c b/gio/tests/gdbus-bz627724.c index b8839bc2a..c66819281 100644 --- a/gio/tests/gdbus-bz627724.c +++ b/gio/tests/gdbus-bz627724.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-close-pending.c b/gio/tests/gdbus-close-pending.c index 762d931eb..d2c5b62f5 100644 --- a/gio/tests/gdbus-close-pending.c +++ b/gio/tests/gdbus-close-pending.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-connection-flush-helper.c b/gio/tests/gdbus-connection-flush-helper.c index 2a8a39bc6..172f3e8f3 100644 --- a/gio/tests/gdbus-connection-flush-helper.c +++ b/gio/tests/gdbus-connection-flush-helper.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-connection-flush.c b/gio/tests/gdbus-connection-flush.c index 7a823672c..39f08e8aa 100644 --- a/gio/tests/gdbus-connection-flush.c +++ b/gio/tests/gdbus-connection-flush.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c index 8ebb87059..6f0140986 100644 --- a/gio/tests/gdbus-connection-loss.c +++ b/gio/tests/gdbus-connection-loss.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-connection-slow.c b/gio/tests/gdbus-connection-slow.c index 9c2f59a4b..82e02587c 100644 --- a/gio/tests/gdbus-connection-slow.c +++ b/gio/tests/gdbus-connection-slow.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c index 488f213ac..35593be9f 100644 --- a/gio/tests/gdbus-connection.c +++ b/gio/tests/gdbus-connection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-error.c b/gio/tests/gdbus-error.c index 960eb8911..96ed42257 100644 --- a/gio/tests/gdbus-error.c +++ b/gio/tests/gdbus-error.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-exit-on-close.c b/gio/tests/gdbus-exit-on-close.c index 291cc8f58..3c4e5ecd6 100644 --- a/gio/tests/gdbus-exit-on-close.c +++ b/gio/tests/gdbus-exit-on-close.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c index 921ba40f7..ef0dddeee 100644 --- a/gio/tests/gdbus-export.c +++ b/gio/tests/gdbus-export.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-introspection.c b/gio/tests/gdbus-introspection.c index 84ba23cd7..50c0cc721 100644 --- a/gio/tests/gdbus-introspection.c +++ b/gio/tests/gdbus-introspection.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c index 7a88bbfad..88a9c5d86 100644 --- a/gio/tests/gdbus-message.c +++ b/gio/tests/gdbus-message.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-names.c b/gio/tests/gdbus-names.c index 90c9eb3a7..648b54774 100644 --- a/gio/tests/gdbus-names.c +++ b/gio/tests/gdbus-names.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-non-socket.c b/gio/tests/gdbus-non-socket.c index c0eae5ec7..64d985a15 100644 --- a/gio/tests/gdbus-non-socket.c +++ b/gio/tests/gdbus-non-socket.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-overflow.c b/gio/tests/gdbus-overflow.c index 507d565ed..53ec9c0b6 100644 --- a/gio/tests/gdbus-overflow.c +++ b/gio/tests/gdbus-overflow.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-peer-object-manager.c b/gio/tests/gdbus-peer-object-manager.c index c40d60378..c5fc6411c 100644 --- a/gio/tests/gdbus-peer-object-manager.c +++ b/gio/tests/gdbus-peer-object-manager.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c index 081eef6f5..845eb3666 100644 --- a/gio/tests/gdbus-peer.c +++ b/gio/tests/gdbus-peer.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-proxy-threads.c b/gio/tests/gdbus-proxy-threads.c index c25b8e76f..75ed21d51 100644 --- a/gio/tests/gdbus-proxy-threads.c +++ b/gio/tests/gdbus-proxy-threads.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-proxy-well-known-name.c b/gio/tests/gdbus-proxy-well-known-name.c index 72d23bdf4..51b537c42 100644 --- a/gio/tests/gdbus-proxy-well-known-name.c +++ b/gio/tests/gdbus-proxy-well-known-name.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-proxy.c b/gio/tests/gdbus-proxy.c index 384f4c738..fff1f48da 100644 --- a/gio/tests/gdbus-proxy.c +++ b/gio/tests/gdbus-proxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c index 2002a9252..da28f1bc1 100644 --- a/gio/tests/gdbus-serialization.c +++ b/gio/tests/gdbus-serialization.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-sessionbus.c b/gio/tests/gdbus-sessionbus.c index 773af55ec..e90096973 100644 --- a/gio/tests/gdbus-sessionbus.c +++ b/gio/tests/gdbus-sessionbus.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-sessionbus.h b/gio/tests/gdbus-sessionbus.h index ca1027320..c756237c0 100644 --- a/gio/tests/gdbus-sessionbus.h +++ b/gio/tests/gdbus-sessionbus.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-test-codegen.c b/gio/tests/gdbus-test-codegen.c index 4abe5a1eb..3a0235106 100644 --- a/gio/tests/gdbus-test-codegen.c +++ b/gio/tests/gdbus-test-codegen.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-tests.c b/gio/tests/gdbus-tests.c index 8237dd0f6..0655f1be4 100644 --- a/gio/tests/gdbus-tests.c +++ b/gio/tests/gdbus-tests.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-tests.h b/gio/tests/gdbus-tests.h index 6e31d7b43..00cda3713 100644 --- a/gio/tests/gdbus-tests.h +++ b/gio/tests/gdbus-tests.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c index 0e9b8b449..a4ef721cb 100644 --- a/gio/tests/gdbus-threading.c +++ b/gio/tests/gdbus-threading.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gdbus-unix-addresses.c b/gio/tests/gdbus-unix-addresses.c index e08328711..23c41d084 100644 --- a/gio/tests/gdbus-unix-addresses.c +++ b/gio/tests/gdbus-unix-addresses.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/glistmodel.c b/gio/tests/glistmodel.c index 6c3512788..898b62886 100644 --- a/gio/tests/glistmodel.c +++ b/gio/tests/glistmodel.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gnotification-server.c b/gio/tests/gnotification-server.c index 5dcc86e2c..9585b0949 100644 --- a/gio/tests/gnotification-server.c +++ b/gio/tests/gnotification-server.c @@ -1,10 +1,10 @@ /* * Copyright © 2013 Lars Uebernickel * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gnotification-server.h b/gio/tests/gnotification-server.h index 3ae3e73c3..d7b69cc1a 100644 --- a/gio/tests/gnotification-server.h +++ b/gio/tests/gnotification-server.h @@ -1,10 +1,10 @@ /* * Copyright © 2013 Lars Uebernickel * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gnotification.c b/gio/tests/gnotification.c index db14b49f5..c896af684 100644 --- a/gio/tests/gnotification.c +++ b/gio/tests/gnotification.c @@ -1,10 +1,10 @@ /* * Copyright © 2013 Lars Uebernickel * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gsubprocess.c b/gio/tests/gsubprocess.c index e1270b1bd..7200226ba 100644 --- a/gio/tests/gsubprocess.c +++ b/gio/tests/gsubprocess.c @@ -948,6 +948,51 @@ test_env (void) g_object_unref (proc); } +/* Test that explicitly inheriting and modifying the parent process’ + * environment works. */ +static void +test_env_inherit (void) +{ + GError *local_error = NULL; + GError **error = &local_error; + GSubprocessLauncher *launcher; + GSubprocess *proc; + GPtrArray *args; + GInputStream *stdout; + gchar *result; + gchar **split; + + g_setenv ("TEST_ENV_INHERIT1", "1", TRUE); + g_setenv ("TEST_ENV_INHERIT2", "2", TRUE); + + args = get_test_subprocess_args ("env", NULL); + launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_NONE); + g_subprocess_launcher_set_flags (launcher, G_SUBPROCESS_FLAGS_STDOUT_PIPE); + g_subprocess_launcher_set_environ (launcher, NULL); + g_subprocess_launcher_setenv (launcher, "TWO", "2", TRUE); + g_subprocess_launcher_unsetenv (launcher, "TEST_ENV_INHERIT1"); + + g_assert_null (g_subprocess_launcher_getenv (launcher, "TEST_ENV_INHERIT1")); + g_assert_cmpstr (g_subprocess_launcher_getenv (launcher, "TEST_ENV_INHERIT2"), ==, "2"); + g_assert_cmpstr (g_subprocess_launcher_getenv (launcher, "TWO"), ==, "2"); + + proc = g_subprocess_launcher_spawn (launcher, error, args->pdata[0], "env", NULL); + g_ptr_array_free (args, TRUE); + g_assert_no_error (local_error); + + stdout = g_subprocess_get_stdout_pipe (proc); + + result = splice_to_string (stdout, error); + split = g_strsplit (result, "\n", -1); + g_assert_null (g_environ_getenv (split, "TEST_ENV_INHERIT1")); + g_assert_cmpstr (g_environ_getenv (split, "TEST_ENV_INHERIT2"), ==, "2"); + g_assert_cmpstr (g_environ_getenv (split, "TWO"), ==, "2"); + + g_strfreev (split); + g_free (result); + g_object_unref (proc); +} + static void test_cwd (void) { @@ -1265,6 +1310,7 @@ main (int argc, char **argv) g_test_add_func ("/gsubprocess/communicate-nothing", test_communicate_nothing); g_test_add_func ("/gsubprocess/terminate", test_terminate); g_test_add_func ("/gsubprocess/env", test_env); + g_test_add_func ("/gsubprocess/env/inherit", test_env_inherit); g_test_add_func ("/gsubprocess/cwd", test_cwd); #ifdef G_OS_UNIX g_test_add_func ("/gsubprocess/stdout-file", test_stdout_file); diff --git a/gio/tests/gtesttlsbackend.c b/gio/tests/gtesttlsbackend.c index 0ee7cbbba..83dad364d 100644 --- a/gio/tests/gtesttlsbackend.c +++ b/gio/tests/gtesttlsbackend.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gtesttlsbackend.h b/gio/tests/gtesttlsbackend.h index 0c62d70c7..11a8bf149 100644 --- a/gio/tests/gtesttlsbackend.h +++ b/gio/tests/gtesttlsbackend.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gtlsconsoleinteraction.c b/gio/tests/gtlsconsoleinteraction.c index bdb2f5e2a..ae734ba60 100644 --- a/gio/tests/gtlsconsoleinteraction.c +++ b/gio/tests/gtlsconsoleinteraction.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/gtlsconsoleinteraction.h b/gio/tests/gtlsconsoleinteraction.h index 80fe32141..7860ba2e7 100644 --- a/gio/tests/gtlsconsoleinteraction.h +++ b/gio/tests/gtlsconsoleinteraction.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/network-monitor.c b/gio/tests/network-monitor.c index b20c46f0e..d0f7ebda8 100644 --- a/gio/tests/network-monitor.c +++ b/gio/tests/network-monitor.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/pollable.c b/gio/tests/pollable.c index 24bd1116b..c61525d09 100644 --- a/gio/tests/pollable.c +++ b/gio/tests/pollable.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/proxy-test.c b/gio/tests/proxy-test.c index 0cbe85c56..3855ae2f8 100644 --- a/gio/tests/proxy-test.c +++ b/gio/tests/proxy-test.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/proxy.c b/gio/tests/proxy.c index 8f687b994..50a20622e 100644 --- a/gio/tests/proxy.c +++ b/gio/tests/proxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/resolver.c b/gio/tests/resolver.c index d4c2056df..85d512428 100644 --- a/gio/tests/resolver.c +++ b/gio/tests/resolver.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/resources.c b/gio/tests/resources.c index 4d2649d12..b002325b8 100644 --- a/gio/tests/resources.c +++ b/gio/tests/resources.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/simple-async-result.c b/gio/tests/simple-async-result.c index e9396dce1..86ba22dad 100644 --- a/gio/tests/simple-async-result.c +++ b/gio/tests/simple-async-result.c @@ -1,10 +1,10 @@ /* * Copyright © 2009 Ryan Lortie * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/gio/tests/simple-proxy.c b/gio/tests/simple-proxy.c index faf1cd638..0f1f63d81 100644 --- a/gio/tests/simple-proxy.c +++ b/gio/tests/simple-proxy.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/sleepy-stream.c b/gio/tests/sleepy-stream.c index 4d3ca1d27..c80871684 100644 --- a/gio/tests/sleepy-stream.c +++ b/gio/tests/sleepy-stream.c @@ -1,10 +1,10 @@ /* * Copyright © 2009 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/gio/tests/socket-listener.c b/gio/tests/socket-listener.c index dcbbfdbc1..31f94460e 100644 --- a/gio/tests/socket-listener.c +++ b/gio/tests/socket-listener.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/socket-service.c b/gio/tests/socket-service.c index 16b669558..9ae76d082 100644 --- a/gio/tests/socket-service.c +++ b/gio/tests/socket-service.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/socket.c b/gio/tests/socket.c index 1dba97048..4343dd537 100644 --- a/gio/tests/socket.c +++ b/gio/tests/socket.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/stream-rw_all.c b/gio/tests/stream-rw_all.c index 5e0dfe426..a5210b546 100644 --- a/gio/tests/stream-rw_all.c +++ b/gio/tests/stream-rw_all.c @@ -1,10 +1,10 @@ /* * Copyright © 2014 Canonical Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/task.c b/gio/tests/task.c index 60ca2847a..08d78e5ef 100644 --- a/gio/tests/task.c +++ b/gio/tests/task.c @@ -1,10 +1,10 @@ /* * Copyright 2012 Red Hat, Inc. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2 of the licence or (at - * your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/gio/tests/test-io-stream.c b/gio/tests/test-io-stream.c index b79f62e4e..cbca9b7a2 100644 --- a/gio/tests/test-io-stream.c +++ b/gio/tests/test-io-stream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/test-io-stream.h b/gio/tests/test-io-stream.h index 2c58ba867..1331c9970 100644 --- a/gio/tests/test-io-stream.h +++ b/gio/tests/test-io-stream.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/test-pipe-unix.c b/gio/tests/test-pipe-unix.c index b9fb38cbf..14b22e763 100644 --- a/gio/tests/test-pipe-unix.c +++ b/gio/tests/test-pipe-unix.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/test-pipe-unix.h b/gio/tests/test-pipe-unix.h index b281744c2..3c47c5554 100644 --- a/gio/tests/test-pipe-unix.h +++ b/gio/tests/test-pipe-unix.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/tls-certificate.c b/gio/tests/tls-certificate.c index 977027262..4cc15d2d7 100644 --- a/gio/tests/tls-certificate.c +++ b/gio/tests/tls-certificate.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c index 64e0104be..345656e29 100644 --- a/gio/tests/tls-interaction.c +++ b/gio/tests/tls-interaction.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/thumbnail-verify.c b/gio/thumbnail-verify.c index bf5c60f77..44fde6bc7 100644 --- a/gio/thumbnail-verify.c +++ b/gio/thumbnail-verify.c @@ -3,7 +3,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/thumbnail-verify.h b/gio/thumbnail-verify.h index a0becd0df..e40680968 100644 --- a/gio/thumbnail-verify.h +++ b/gio/thumbnail-verify.h @@ -3,7 +3,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwin32filemonitor.c b/gio/win32/gwin32filemonitor.c index abaafa3a6..838357011 100644 --- a/gio/win32/gwin32filemonitor.c +++ b/gio/win32/gwin32filemonitor.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwin32filemonitor.h b/gio/win32/gwin32filemonitor.h index 5aef2ba3f..132bd248a 100644 --- a/gio/win32/gwin32filemonitor.h +++ b/gio/win32/gwin32filemonitor.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwin32fsmonitorutils.c b/gio/win32/gwin32fsmonitorutils.c index 6cdcbc83e..ff8d1710c 100644 --- a/gio/win32/gwin32fsmonitorutils.c +++ b/gio/win32/gwin32fsmonitorutils.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwin32fsmonitorutils.h b/gio/win32/gwin32fsmonitorutils.h index 96e071639..b42507f63 100644 --- a/gio/win32/gwin32fsmonitorutils.h +++ b/gio/win32/gwin32fsmonitorutils.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c index fd9759341..d5df16d91 100644 --- a/gio/win32/gwinhttpfile.c +++ b/gio/win32/gwinhttpfile.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfile.h b/gio/win32/gwinhttpfile.h index 10bf64580..69b9d15d4 100644 --- a/gio/win32/gwinhttpfile.h +++ b/gio/win32/gwinhttpfile.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfileinputstream.c b/gio/win32/gwinhttpfileinputstream.c index 685212c55..871274e34 100644 --- a/gio/win32/gwinhttpfileinputstream.c +++ b/gio/win32/gwinhttpfileinputstream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfileinputstream.h b/gio/win32/gwinhttpfileinputstream.h index 5f635d425..e27ea549a 100644 --- a/gio/win32/gwinhttpfileinputstream.h +++ b/gio/win32/gwinhttpfileinputstream.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfileoutputstream.c b/gio/win32/gwinhttpfileoutputstream.c index 6c3e2cf48..f54f86ccc 100644 --- a/gio/win32/gwinhttpfileoutputstream.c +++ b/gio/win32/gwinhttpfileoutputstream.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpfileoutputstream.h b/gio/win32/gwinhttpfileoutputstream.h index f532e72c0..fc7019cb2 100644 --- a/gio/win32/gwinhttpfileoutputstream.h +++ b/gio/win32/gwinhttpfileoutputstream.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpvfs.c b/gio/win32/gwinhttpvfs.c index 99d52287f..d32a4cbe1 100644 --- a/gio/win32/gwinhttpvfs.c +++ b/gio/win32/gwinhttpvfs.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/win32/gwinhttpvfs.h b/gio/win32/gwinhttpvfs.h index e04c73592..fdac94a5f 100644 --- a/gio/win32/gwinhttpvfs.h +++ b/gio/win32/gwinhttpvfs.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c index 9ba224a9e..0584fd5ab 100644 --- a/gio/xdgmime/xdgmime.c +++ b/gio/xdgmime/xdgmime.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmime.h b/gio/xdgmime/xdgmime.h index fda8a5c4f..d30106245 100644 --- a/gio/xdgmime/xdgmime.h +++ b/gio/xdgmime/xdgmime.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimealias.c b/gio/xdgmime/xdgmimealias.c index deea51e8d..5bc70c347 100644 --- a/gio/xdgmime/xdgmimealias.c +++ b/gio/xdgmime/xdgmimealias.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimealias.h b/gio/xdgmime/xdgmimealias.h index 0ee7822a1..46cbc99c3 100644 --- a/gio/xdgmime/xdgmimealias.h +++ b/gio/xdgmime/xdgmimealias.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c index e2d49ed22..1bcaf48e4 100644 --- a/gio/xdgmime/xdgmimecache.c +++ b/gio/xdgmime/xdgmimecache.c @@ -11,7 +11,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimecache.h b/gio/xdgmime/xdgmimecache.h index 7bcfcbc71..2723c5396 100644 --- a/gio/xdgmime/xdgmimecache.h +++ b/gio/xdgmime/xdgmimecache.h @@ -11,7 +11,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c index 73ef7a54f..1d4fbc40d 100644 --- a/gio/xdgmime/xdgmimeglob.c +++ b/gio/xdgmime/xdgmimeglob.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeglob.h b/gio/xdgmime/xdgmimeglob.h index fe942a34f..79ccdc292 100644 --- a/gio/xdgmime/xdgmimeglob.h +++ b/gio/xdgmime/xdgmimeglob.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeicon.c b/gio/xdgmime/xdgmimeicon.c index 08322a4a4..603d041e4 100644 --- a/gio/xdgmime/xdgmimeicon.c +++ b/gio/xdgmime/xdgmimeicon.c @@ -11,7 +11,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeicon.h b/gio/xdgmime/xdgmimeicon.h index f13095151..6141a8668 100644 --- a/gio/xdgmime/xdgmimeicon.h +++ b/gio/xdgmime/xdgmimeicon.h @@ -11,7 +11,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeint.c b/gio/xdgmime/xdgmimeint.c index 9faed72f0..e1e9b4d99 100644 --- a/gio/xdgmime/xdgmimeint.c +++ b/gio/xdgmime/xdgmimeint.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeint.h b/gio/xdgmime/xdgmimeint.h index de45868f5..8acd8d5cd 100644 --- a/gio/xdgmime/xdgmimeint.h +++ b/gio/xdgmime/xdgmimeint.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimemagic.c b/gio/xdgmime/xdgmimemagic.c index 20bc2b453..051d727a8 100644 --- a/gio/xdgmime/xdgmimemagic.c +++ b/gio/xdgmime/xdgmimemagic.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimemagic.h b/gio/xdgmime/xdgmimemagic.h index 210a5bd0b..c990acee8 100644 --- a/gio/xdgmime/xdgmimemagic.h +++ b/gio/xdgmime/xdgmimemagic.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeparent.c b/gio/xdgmime/xdgmimeparent.c index b29cfd58a..8b38b83b3 100644 --- a/gio/xdgmime/xdgmimeparent.c +++ b/gio/xdgmime/xdgmimeparent.c @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdgmime/xdgmimeparent.h b/gio/xdgmime/xdgmimeparent.h index d0a46c461..e3cdad5bf 100644 --- a/gio/xdgmime/xdgmimeparent.h +++ b/gio/xdgmime/xdgmimeparent.h @@ -12,7 +12,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gio/xdp-dbus.c b/gio/xdp-dbus.c index 55e559531..0cd7668e3 100644 --- a/gio/xdp-dbus.c +++ b/gio/xdp-dbus.c @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.2. DO NOT EDIT. + * Generated by gdbus-codegen 2.53.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -347,6 +347,101 @@ static const _ExtendedGDBusMethodInfo _gxdp_documents_method_info_add_named = TRUE }; +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_IN_ARG_o_path_fds = +{ + { + -1, + (gchar *) "o_path_fds", + (gchar *) "ah", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_IN_ARG_flags = +{ + { + -1, + (gchar *) "flags", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_IN_ARG_app_id = +{ + { + -1, + (gchar *) "app_id", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_IN_ARG_permissions = +{ + { + -1, + (gchar *) "permissions", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_documents_method_info_add_full_IN_ARG_pointers[] = +{ + &_gxdp_documents_method_info_add_full_IN_ARG_o_path_fds, + &_gxdp_documents_method_info_add_full_IN_ARG_flags, + &_gxdp_documents_method_info_add_full_IN_ARG_app_id, + &_gxdp_documents_method_info_add_full_IN_ARG_permissions, + NULL +}; + +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_OUT_ARG_doc_ids = +{ + { + -1, + (gchar *) "doc_ids", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_add_full_OUT_ARG_extra_out = +{ + { + -1, + (gchar *) "extra_out", + (gchar *) "a{sv}", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_documents_method_info_add_full_OUT_ARG_pointers[] = +{ + &_gxdp_documents_method_info_add_full_OUT_ARG_doc_ids, + &_gxdp_documents_method_info_add_full_OUT_ARG_extra_out, + NULL +}; + +static const _ExtendedGDBusMethodInfo _gxdp_documents_method_info_add_full = +{ + { + -1, + (gchar *) "AddFull", + (GDBusArgInfo **) &_gxdp_documents_method_info_add_full_IN_ARG_pointers, + (GDBusArgInfo **) &_gxdp_documents_method_info_add_full_OUT_ARG_pointers, + NULL + }, + "handle-add-full", + TRUE +}; + static const _ExtendedGDBusArgInfo _gxdp_documents_method_info_grant_permissions_IN_ARG_doc_id = { { @@ -643,6 +738,7 @@ static const _ExtendedGDBusMethodInfo * const _gxdp_documents_method_info_pointe &_gxdp_documents_method_info_get_mount_point, &_gxdp_documents_method_info_add, &_gxdp_documents_method_info_add_named, + &_gxdp_documents_method_info_add_full, &_gxdp_documents_method_info_grant_permissions, &_gxdp_documents_method_info_revoke_permissions, &_gxdp_documents_method_info_delete, @@ -652,6 +748,25 @@ static const _ExtendedGDBusMethodInfo * const _gxdp_documents_method_info_pointe NULL }; +static const _ExtendedGDBusPropertyInfo _gxdp_documents_property_info_version = +{ + { + -1, + (gchar *) "version", + (gchar *) "u", + G_DBUS_PROPERTY_INFO_FLAGS_READABLE, + NULL + }, + "version", + FALSE +}; + +static const _ExtendedGDBusPropertyInfo * const _gxdp_documents_property_info_pointers[] = +{ + &_gxdp_documents_property_info_version, + NULL +}; + static const _ExtendedGDBusInterfaceInfo _gxdp_documents_interface_info = { { @@ -659,7 +774,7 @@ static const _ExtendedGDBusInterfaceInfo _gxdp_documents_interface_info = (gchar *) "org.freedesktop.portal.Documents", (GDBusMethodInfo **) &_gxdp_documents_method_info_pointers, NULL, - NULL, + (GDBusPropertyInfo **) &_gxdp_documents_property_info_pointers, NULL }, "documents", @@ -692,6 +807,7 @@ gxdp_documents_interface_info (void) guint gxdp_documents_override_properties (GObjectClass *klass, guint property_id_begin) { + g_object_class_override_property (klass, property_id_begin++, "version"); return property_id_begin - 1; } @@ -707,6 +823,7 @@ gxdp_documents_override_properties (GObjectClass *klass, guint property_id_begin * GXdpDocumentsIface: * @parent_iface: The parent interface. * @handle_add: Handler for the #GXdpDocuments::handle-add signal. + * @handle_add_full: Handler for the #GXdpDocuments::handle-add-full signal. * @handle_add_named: Handler for the #GXdpDocuments::handle-add-named signal. * @handle_delete: Handler for the #GXdpDocuments::handle-delete signal. * @handle_get_mount_point: Handler for the #GXdpDocuments::handle-get-mount-point signal. @@ -715,6 +832,7 @@ gxdp_documents_override_properties (GObjectClass *klass, guint property_id_begin * @handle_list: Handler for the #GXdpDocuments::handle-list signal. * @handle_lookup: Handler for the #GXdpDocuments::handle-lookup signal. * @handle_revoke_permissions: Handler for the #GXdpDocuments::handle-revoke-permissions signal. + * @get_version: Getter for the #GXdpDocuments:version property. * * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-Documents.top_of_page">org.freedesktop.portal.Documents</link>. */ @@ -802,6 +920,33 @@ gxdp_documents_default_init (GXdpDocumentsIface *iface) G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UNIX_FD_LIST, G_TYPE_VARIANT, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN); /** + * GXdpDocuments::handle-add-full: + * @object: A #GXdpDocuments. + * @invocation: A #GDBusMethodInvocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @arg_o_path_fds: Argument passed by remote caller. + * @arg_flags: Argument passed by remote caller. + * @arg_app_id: Argument passed by remote caller. + * @arg_permissions: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-portal-Documents.AddFull">AddFull()</link> D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gxdp_documents_complete_add_full() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-add-full", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GXdpDocumentsIface, handle_add_full), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 6, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UNIX_FD_LIST, G_TYPE_VARIANT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRV); + + /** * GXdpDocuments::handle-grant-permissions: * @object: A #GXdpDocuments. * @invocation: A #GDBusMethodInvocation. @@ -943,6 +1088,47 @@ gxdp_documents_default_init (GXdpDocumentsIface *iface) 2, G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); + /* GObject properties for D-Bus properties: */ + /** + * GXdpDocuments:version: + * + * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-portal-Documents.version">"version"</link>. + * + * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side. + */ + g_object_interface_install_property (iface, + g_param_spec_uint ("version", "version", "version", 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +/** + * gxdp_documents_get_version: (skip) + * @object: A #GXdpDocuments. + * + * Gets the value of the <link linkend="gdbus-property-org-freedesktop-portal-Documents.version">"version"</link> D-Bus property. + * + * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. + * + * Returns: The property value. + */ +guint +gxdp_documents_get_version (GXdpDocuments *object) +{ + return GXDP_DOCUMENTS_GET_IFACE (object)->get_version (object); +} + +/** + * gxdp_documents_set_version: (skip) + * @object: A #GXdpDocuments. + * @value: The value to set. + * + * Sets the <link linkend="gdbus-property-org-freedesktop-portal-Documents.version">"version"</link> D-Bus property to @value. + * + * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side. + */ +void +gxdp_documents_set_version (GXdpDocuments *object, guint value) +{ + g_object_set (G_OBJECT (object), "version", value, NULL); } /** @@ -1304,6 +1490,145 @@ _out: } /** + * gxdp_documents_call_add_full: + * @proxy: A #GXdpDocumentsProxy. + * @arg_o_path_fds: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @arg_app_id: Argument to pass with the method invocation. + * @arg_permissions: Argument to pass with the method invocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-Documents.AddFull">AddFull()</link> D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. + * You can then call gxdp_documents_call_add_full_finish() to get the result of the operation. + * + * See gxdp_documents_call_add_full_sync() for the synchronous, blocking version of this method. + */ +void +gxdp_documents_call_add_full ( + GXdpDocuments *proxy, + GVariant *arg_o_path_fds, + guint arg_flags, + const gchar *arg_app_id, + const gchar *const *arg_permissions, + GUnixFDList *fd_list, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call_with_unix_fd_list (G_DBUS_PROXY (proxy), + "AddFull", + g_variant_new ("(@ahus^as)", + arg_o_path_fds, + arg_flags, + arg_app_id, + arg_permissions), + G_DBUS_CALL_FLAGS_NONE, + -1, + fd_list, + cancellable, + callback, + user_data); +} + +/** + * gxdp_documents_call_add_full_finish: + * @proxy: A #GXdpDocumentsProxy. + * @out_doc_ids: (out): Return location for return parameter or %NULL to ignore. + * @out_extra_out: (out): Return location for return parameter or %NULL to ignore. + * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gxdp_documents_call_add_full(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with gxdp_documents_call_add_full(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_documents_call_add_full_finish ( + GXdpDocuments *proxy, + gchar ***out_doc_ids, + GVariant **out_extra_out, + GUnixFDList **out_fd_list, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_with_unix_fd_list_finish (G_DBUS_PROXY (proxy), out_fd_list, res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as@a{sv})", + out_doc_ids, + out_extra_out); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * gxdp_documents_call_add_full_sync: + * @proxy: A #GXdpDocumentsProxy. + * @arg_o_path_fds: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @arg_app_id: Argument to pass with the method invocation. + * @arg_permissions: Argument to pass with the method invocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @out_doc_ids: (out): Return location for return parameter or %NULL to ignore. + * @out_extra_out: (out): Return location for return parameter or %NULL to ignore. + * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-Documents.AddFull">AddFull()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See gxdp_documents_call_add_full() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_documents_call_add_full_sync ( + GXdpDocuments *proxy, + GVariant *arg_o_path_fds, + guint arg_flags, + const gchar *arg_app_id, + const gchar *const *arg_permissions, + GUnixFDList *fd_list, + gchar ***out_doc_ids, + GVariant **out_extra_out, + GUnixFDList **out_fd_list, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_with_unix_fd_list_sync (G_DBUS_PROXY (proxy), + "AddFull", + g_variant_new ("(@ahus^as)", + arg_o_path_fds, + arg_flags, + arg_app_id, + arg_permissions), + G_DBUS_CALL_FLAGS_NONE, + -1, + fd_list, + out_fd_list, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as@a{sv})", + out_doc_ids, + out_extra_out); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** * gxdp_documents_call_grant_permissions: * @proxy: A #GXdpDocumentsProxy. * @arg_doc_id: Argument to pass with the method invocation. @@ -2009,6 +2334,33 @@ gxdp_documents_complete_add_named ( } /** + * gxdp_documents_complete_add_full: + * @object: A #GXdpDocuments. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @doc_ids: Parameter to return. + * @extra_out: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-portal-Documents.AddFull">AddFull()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +gxdp_documents_complete_add_full ( + GXdpDocuments *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + const gchar *const *doc_ids, + GVariant *extra_out) +{ + g_dbus_method_invocation_return_value_with_unix_fd_list (invocation, + g_variant_new ("(^as@a{sv})", + doc_ids, + extra_out), + fd_list); +} + +/** * gxdp_documents_complete_grant_permissions: * @object: A #GXdpDocuments. * @invocation: (transfer full): A #GDBusMethodInvocation. @@ -2174,6 +2526,45 @@ gxdp_documents_proxy_get_property (GObject *object, GValue *value, GParamSpec *pspec G_GNUC_UNUSED) { + const _ExtendedGDBusPropertyInfo *info; + GVariant *variant; + g_assert (prop_id != 0 && prop_id - 1 < 1); + info = _gxdp_documents_property_info_pointers[prop_id - 1]; + variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); + if (info->use_gvariant) + { + g_value_set_variant (value, variant); + } + else + { + if (variant != NULL) + g_dbus_gvariant_to_gvalue (variant, value); + } + if (variant != NULL) + g_variant_unref (variant); +} + +static void +gxdp_documents_proxy_set_property_cb (GDBusProxy *proxy, + GAsyncResult *res, + gpointer user_data) +{ + const _ExtendedGDBusPropertyInfo *info = user_data; + GError *error; + GVariant *_ret; + error = NULL; + _ret = g_dbus_proxy_call_finish (proxy, res, &error); + if (!_ret) + { + g_warning ("Error setting property '%s' on interface org.freedesktop.portal.Documents: %s (%s, %d)", + info->parent_struct.name, + error->message, g_quark_to_string (error->domain), error->code); + g_error_free (error); + } + else + { + g_variant_unref (_ret); + } } static void @@ -2182,6 +2573,18 @@ gxdp_documents_proxy_set_property (GObject *object, const GValue *value, GParamSpec *pspec G_GNUC_UNUSED) { + const _ExtendedGDBusPropertyInfo *info; + GVariant *variant; + g_assert (prop_id != 0 && prop_id - 1 < 1); + info = _gxdp_documents_property_info_pointers[prop_id - 1]; + variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_dbus_proxy_call (G_DBUS_PROXY (object), + "org.freedesktop.DBus.Properties.Set", + g_variant_new ("(ssv)", "org.freedesktop.portal.Documents", info->parent_struct.name, variant), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, (GAsyncReadyCallback) gxdp_documents_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct); + g_variant_unref (variant); } static void @@ -2254,6 +2657,21 @@ gxdp_documents_proxy_g_properties_changed (GDBusProxy *_proxy, } } +static guint +gxdp_documents_proxy_get_version (GXdpDocuments *object) +{ + GXdpDocumentsProxy *proxy = GXDP_DOCUMENTS_PROXY (object); + GVariant *variant; + guint value = 0; + variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "version"); + if (variant != NULL) + { + value = g_variant_get_uint32 (variant); + g_variant_unref (variant); + } + return value; +} + static void gxdp_documents_proxy_init (GXdpDocumentsProxy *proxy) { @@ -2281,6 +2699,8 @@ gxdp_documents_proxy_class_init (GXdpDocumentsProxyClass *klass) proxy_class->g_signal = gxdp_documents_proxy_g_signal; proxy_class->g_properties_changed = gxdp_documents_proxy_g_properties_changed; + gxdp_documents_override_properties (gobject_class, 1); + #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 g_type_class_add_private (klass, sizeof (GXdpDocumentsProxyPrivate)); #endif @@ -2289,6 +2709,7 @@ gxdp_documents_proxy_class_init (GXdpDocumentsProxyClass *klass) static void gxdp_documents_proxy_iface_init (GXdpDocumentsIface *iface) { + iface->get_version = gxdp_documents_proxy_get_version; } /** @@ -2678,9 +3099,25 @@ out: return g_variant_builder_end (&builder); } +static gboolean _gxdp_documents_emit_changed (gpointer user_data); + static void gxdp_documents_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) { + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (_skeleton); + gboolean emit_changed = FALSE; + + g_mutex_lock (&skeleton->priv->lock); + if (skeleton->priv->changed_properties_idle_source != NULL) + { + g_source_destroy (skeleton->priv->changed_properties_idle_source); + skeleton->priv->changed_properties_idle_source = NULL; + emit_changed = TRUE; + } + g_mutex_unlock (&skeleton->priv->lock); + + if (emit_changed) + _gxdp_documents_emit_changed (skeleton); } static void gxdp_documents_skeleton_iface_init (GXdpDocumentsIface *iface); @@ -2698,6 +3135,10 @@ static void gxdp_documents_skeleton_finalize (GObject *object) { GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (object); + guint n; + for (n = 0; n < 1; n++) + g_value_unset (&skeleton->priv->properties[n]); + g_free (skeleton->priv->properties); g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); if (skeleton->priv->changed_properties_idle_source != NULL) g_source_destroy (skeleton->priv->changed_properties_idle_source); @@ -2707,6 +3148,145 @@ gxdp_documents_skeleton_finalize (GObject *object) } static void +gxdp_documents_skeleton_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (object); + g_assert (prop_id != 0 && prop_id - 1 < 1); + g_mutex_lock (&skeleton->priv->lock); + g_value_copy (&skeleton->priv->properties[prop_id - 1], value); + g_mutex_unlock (&skeleton->priv->lock); +} + +static gboolean +_gxdp_documents_emit_changed (gpointer user_data) +{ + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (user_data); + GList *l; + GVariantBuilder builder; + GVariantBuilder invalidated_builder; + guint num_changes; + + g_mutex_lock (&skeleton->priv->lock); + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as")); + for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next) + { + ChangedProperty *cp = l->data; + GVariant *variant; + const GValue *cur_value; + + cur_value = &skeleton->priv->properties[cp->prop_id - 1]; + if (!_g_value_equal (cur_value, &cp->orig_value)) + { + variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature)); + g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant); + g_variant_unref (variant); + num_changes++; + } + } + if (num_changes > 0) + { + GList *connections, *ll; + GVariant *signal_variant; + signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.portal.Documents", + &builder, &invalidated_builder)); + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + for (ll = connections; ll != NULL; ll = ll->next) + { + GDBusConnection *connection = ll->data; + + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), + "org.freedesktop.DBus.Properties", + "PropertiesChanged", + signal_variant, + NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); + } + else + { + g_variant_builder_clear (&builder); + g_variant_builder_clear (&invalidated_builder); + } + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + skeleton->priv->changed_properties = NULL; + skeleton->priv->changed_properties_idle_source = NULL; + g_mutex_unlock (&skeleton->priv->lock); + return FALSE; +} + +static void +_gxdp_documents_schedule_emit_changed (GXdpDocumentsSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value) +{ + ChangedProperty *cp; + GList *l; + cp = NULL; + for (l = skeleton->priv->changed_properties; l != NULL; l = l->next) + { + ChangedProperty *i_cp = l->data; + if (i_cp->info == info) + { + cp = i_cp; + break; + } + } + if (cp == NULL) + { + cp = g_new0 (ChangedProperty, 1); + cp->prop_id = prop_id; + cp->info = info; + skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp); + g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value)); + g_value_copy (orig_value, &cp->orig_value); + } +} + +static void +gxdp_documents_skeleton_notify (GObject *object, + GParamSpec *pspec G_GNUC_UNUSED) +{ + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (object); + g_mutex_lock (&skeleton->priv->lock); + if (skeleton->priv->changed_properties != NULL && + skeleton->priv->changed_properties_idle_source == NULL) + { + skeleton->priv->changed_properties_idle_source = g_idle_source_new (); + g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT); + g_source_set_callback (skeleton->priv->changed_properties_idle_source, _gxdp_documents_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref); + g_source_set_name (skeleton->priv->changed_properties_idle_source, "[generated] _gxdp_documents_emit_changed"); + g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context); + g_source_unref (skeleton->priv->changed_properties_idle_source); + } + g_mutex_unlock (&skeleton->priv->lock); +} + +static void +gxdp_documents_skeleton_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (object); + g_assert (prop_id != 0 && prop_id - 1 < 1); + g_mutex_lock (&skeleton->priv->lock); + g_object_freeze_notify (object); + if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) + { + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) + _gxdp_documents_schedule_emit_changed (skeleton, _gxdp_documents_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); + g_object_notify_by_pspec (object, pspec); + } + g_mutex_unlock (&skeleton->priv->lock); + g_object_thaw_notify (object); +} + +static void gxdp_documents_skeleton_init (GXdpDocumentsSkeleton *skeleton) { #if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 @@ -2717,6 +3297,19 @@ gxdp_documents_skeleton_init (GXdpDocumentsSkeleton *skeleton) g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); + skeleton->priv->properties = g_new0 (GValue, 1); + g_value_init (&skeleton->priv->properties[0], G_TYPE_UINT); +} + +static guint +gxdp_documents_skeleton_get_version (GXdpDocuments *object) +{ + GXdpDocumentsSkeleton *skeleton = GXDP_DOCUMENTS_SKELETON (object); + guint value; + g_mutex_lock (&skeleton->priv->lock); + value = g_value_get_uint (&(skeleton->priv->properties[0])); + g_mutex_unlock (&skeleton->priv->lock); + return value; } static void @@ -2727,6 +3320,12 @@ gxdp_documents_skeleton_class_init (GXdpDocumentsSkeletonClass *klass) gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gxdp_documents_skeleton_finalize; + gobject_class->get_property = gxdp_documents_skeleton_get_property; + gobject_class->set_property = gxdp_documents_skeleton_set_property; + gobject_class->notify = gxdp_documents_skeleton_notify; + + + gxdp_documents_override_properties (gobject_class, 1); skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); skeleton_class->get_info = gxdp_documents_skeleton_dbus_interface_get_info; @@ -2742,6 +3341,7 @@ gxdp_documents_skeleton_class_init (GXdpDocumentsSkeletonClass *klass) static void gxdp_documents_skeleton_iface_init (GXdpDocumentsIface *iface) { + iface->get_version = gxdp_documents_skeleton_get_version; } /** @@ -2758,6 +3358,1517 @@ gxdp_documents_skeleton_new (void) } /* ------------------------------------------------------------------------ + * Code for interface org.freedesktop.portal.OpenURI + * ------------------------------------------------------------------------ + */ + +/** + * SECTION:GXdpOpenURI + * @title: GXdpOpenURI + * @short_description: Generated C code for the org.freedesktop.portal.OpenURI D-Bus interface + * + * This section contains code for working with the <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link> D-Bus interface in C. + */ + +/* ---- Introspection data for org.freedesktop.portal.OpenURI ---- */ + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_uri_IN_ARG_parent_window = +{ + { + -1, + (gchar *) "parent_window", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_uri_IN_ARG_uri = +{ + { + -1, + (gchar *) "uri", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_uri_IN_ARG_options = +{ + { + -1, + (gchar *) "options", + (gchar *) "a{sv}", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_open_uri_method_info_open_uri_IN_ARG_pointers[] = +{ + &_gxdp_open_uri_method_info_open_uri_IN_ARG_parent_window, + &_gxdp_open_uri_method_info_open_uri_IN_ARG_uri, + &_gxdp_open_uri_method_info_open_uri_IN_ARG_options, + NULL +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_uri_OUT_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "o", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_open_uri_method_info_open_uri_OUT_ARG_pointers[] = +{ + &_gxdp_open_uri_method_info_open_uri_OUT_ARG_handle, + NULL +}; + +static const _ExtendedGDBusMethodInfo _gxdp_open_uri_method_info_open_uri = +{ + { + -1, + (gchar *) "OpenURI", + (GDBusArgInfo **) &_gxdp_open_uri_method_info_open_uri_IN_ARG_pointers, + (GDBusArgInfo **) &_gxdp_open_uri_method_info_open_uri_OUT_ARG_pointers, + NULL + }, + "handle-open-uri", + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_file_IN_ARG_parent_window = +{ + { + -1, + (gchar *) "parent_window", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_file_IN_ARG_fd = +{ + { + -1, + (gchar *) "fd", + (gchar *) "h", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_file_IN_ARG_options = +{ + { + -1, + (gchar *) "options", + (gchar *) "a{sv}", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_open_uri_method_info_open_file_IN_ARG_pointers[] = +{ + &_gxdp_open_uri_method_info_open_file_IN_ARG_parent_window, + &_gxdp_open_uri_method_info_open_file_IN_ARG_fd, + &_gxdp_open_uri_method_info_open_file_IN_ARG_options, + NULL +}; + +static const _ExtendedGDBusArgInfo _gxdp_open_uri_method_info_open_file_OUT_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "o", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _gxdp_open_uri_method_info_open_file_OUT_ARG_pointers[] = +{ + &_gxdp_open_uri_method_info_open_file_OUT_ARG_handle, + NULL +}; + +static const _ExtendedGDBusMethodInfo _gxdp_open_uri_method_info_open_file = +{ + { + -1, + (gchar *) "OpenFile", + (GDBusArgInfo **) &_gxdp_open_uri_method_info_open_file_IN_ARG_pointers, + (GDBusArgInfo **) &_gxdp_open_uri_method_info_open_file_OUT_ARG_pointers, + NULL + }, + "handle-open-file", + TRUE +}; + +static const _ExtendedGDBusMethodInfo * const _gxdp_open_uri_method_info_pointers[] = +{ + &_gxdp_open_uri_method_info_open_uri, + &_gxdp_open_uri_method_info_open_file, + NULL +}; + +static const _ExtendedGDBusPropertyInfo _gxdp_open_uri_property_info_version = +{ + { + -1, + (gchar *) "version", + (gchar *) "u", + G_DBUS_PROPERTY_INFO_FLAGS_READABLE, + NULL + }, + "version", + FALSE +}; + +static const _ExtendedGDBusPropertyInfo * const _gxdp_open_uri_property_info_pointers[] = +{ + &_gxdp_open_uri_property_info_version, + NULL +}; + +static const _ExtendedGDBusInterfaceInfo _gxdp_open_uri_interface_info = +{ + { + -1, + (gchar *) "org.freedesktop.portal.OpenURI", + (GDBusMethodInfo **) &_gxdp_open_uri_method_info_pointers, + NULL, + (GDBusPropertyInfo **) &_gxdp_open_uri_property_info_pointers, + NULL + }, + "open-uri", +}; + + +/** + * gxdp_open_uri_interface_info: + * + * Gets a machine-readable description of the <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link> D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ +GDBusInterfaceInfo * +gxdp_open_uri_interface_info (void) +{ + return (GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct; +} + +/** + * gxdp_open_uri_override_properties: + * @klass: The class structure for a #GObject<!-- -->-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #GXdpOpenURI interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ +guint +gxdp_open_uri_override_properties (GObjectClass *klass, guint property_id_begin) +{ + g_object_class_override_property (klass, property_id_begin++, "version"); + return property_id_begin - 1; +} + + + +/** + * GXdpOpenURI: + * + * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link>. + */ + +/** + * GXdpOpenURIIface: + * @parent_iface: The parent interface. + * @handle_open_file: Handler for the #GXdpOpenURI::handle-open-file signal. + * @handle_open_uri: Handler for the #GXdpOpenURI::handle-open-uri signal. + * @get_version: Getter for the #GXdpOpenURI:version property. + * + * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link>. + */ + +typedef GXdpOpenURIIface GXdpOpenURIInterface; +G_DEFINE_INTERFACE (GXdpOpenURI, gxdp_open_uri, G_TYPE_OBJECT) + +static void +gxdp_open_uri_default_init (GXdpOpenURIIface *iface) +{ + /* GObject signals for incoming D-Bus method calls: */ + /** + * GXdpOpenURI::handle-open-uri: + * @object: A #GXdpOpenURI. + * @invocation: A #GDBusMethodInvocation. + * @arg_parent_window: Argument passed by remote caller. + * @arg_uri: Argument passed by remote caller. + * @arg_options: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenURI">OpenURI()</link> D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gxdp_open_uri_complete_open_uri() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-open-uri", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GXdpOpenURIIface, handle_open_uri), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 4, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_VARIANT); + + /** + * GXdpOpenURI::handle-open-file: + * @object: A #GXdpOpenURI. + * @invocation: A #GDBusMethodInvocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @arg_parent_window: Argument passed by remote caller. + * @arg_fd: Argument passed by remote caller. + * @arg_options: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenFile">OpenFile()</link> D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call gxdp_open_uri_complete_open_file() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-open-file", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GXdpOpenURIIface, handle_open_file), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 5, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UNIX_FD_LIST, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_VARIANT); + + /* GObject properties for D-Bus properties: */ + /** + * GXdpOpenURI:version: + * + * Represents the D-Bus property <link linkend="gdbus-property-org-freedesktop-portal-OpenURI.version">"version"</link>. + * + * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side. + */ + g_object_interface_install_property (iface, + g_param_spec_uint ("version", "version", "version", 0, G_MAXUINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +/** + * gxdp_open_uri_get_version: (skip) + * @object: A #GXdpOpenURI. + * + * Gets the value of the <link linkend="gdbus-property-org-freedesktop-portal-OpenURI.version">"version"</link> D-Bus property. + * + * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. + * + * Returns: The property value. + */ +guint +gxdp_open_uri_get_version (GXdpOpenURI *object) +{ + return GXDP_OPEN_URI_GET_IFACE (object)->get_version (object); +} + +/** + * gxdp_open_uri_set_version: (skip) + * @object: A #GXdpOpenURI. + * @value: The value to set. + * + * Sets the <link linkend="gdbus-property-org-freedesktop-portal-OpenURI.version">"version"</link> D-Bus property to @value. + * + * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side. + */ +void +gxdp_open_uri_set_version (GXdpOpenURI *object, guint value) +{ + g_object_set (G_OBJECT (object), "version", value, NULL); +} + +/** + * gxdp_open_uri_call_open_uri: + * @proxy: A #GXdpOpenURIProxy. + * @arg_parent_window: Argument to pass with the method invocation. + * @arg_uri: Argument to pass with the method invocation. + * @arg_options: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenURI">OpenURI()</link> D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. + * You can then call gxdp_open_uri_call_open_uri_finish() to get the result of the operation. + * + * See gxdp_open_uri_call_open_uri_sync() for the synchronous, blocking version of this method. + */ +void +gxdp_open_uri_call_open_uri ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + const gchar *arg_uri, + GVariant *arg_options, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "OpenURI", + g_variant_new ("(ss@a{sv})", + arg_parent_window, + arg_uri, + arg_options), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * gxdp_open_uri_call_open_uri_finish: + * @proxy: A #GXdpOpenURIProxy. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gxdp_open_uri_call_open_uri(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with gxdp_open_uri_call_open_uri(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_open_uri_call_open_uri_finish ( + GXdpOpenURI *proxy, + gchar **out_handle, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(o)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * gxdp_open_uri_call_open_uri_sync: + * @proxy: A #GXdpOpenURIProxy. + * @arg_parent_window: Argument to pass with the method invocation. + * @arg_uri: Argument to pass with the method invocation. + * @arg_options: Argument to pass with the method invocation. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenURI">OpenURI()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See gxdp_open_uri_call_open_uri() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_open_uri_call_open_uri_sync ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + const gchar *arg_uri, + GVariant *arg_options, + gchar **out_handle, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "OpenURI", + g_variant_new ("(ss@a{sv})", + arg_parent_window, + arg_uri, + arg_options), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(o)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * gxdp_open_uri_call_open_file: + * @proxy: A #GXdpOpenURIProxy. + * @arg_parent_window: Argument to pass with the method invocation. + * @arg_fd: Argument to pass with the method invocation. + * @arg_options: Argument to pass with the method invocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenFile">OpenFile()</link> D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. + * You can then call gxdp_open_uri_call_open_file_finish() to get the result of the operation. + * + * See gxdp_open_uri_call_open_file_sync() for the synchronous, blocking version of this method. + */ +void +gxdp_open_uri_call_open_file ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + GVariant *arg_fd, + GVariant *arg_options, + GUnixFDList *fd_list, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call_with_unix_fd_list (G_DBUS_PROXY (proxy), + "OpenFile", + g_variant_new ("(s@h@a{sv})", + arg_parent_window, + arg_fd, + arg_options), + G_DBUS_CALL_FLAGS_NONE, + -1, + fd_list, + cancellable, + callback, + user_data); +} + +/** + * gxdp_open_uri_call_open_file_finish: + * @proxy: A #GXdpOpenURIProxy. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gxdp_open_uri_call_open_file(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with gxdp_open_uri_call_open_file(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_open_uri_call_open_file_finish ( + GXdpOpenURI *proxy, + gchar **out_handle, + GUnixFDList **out_fd_list, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_with_unix_fd_list_finish (G_DBUS_PROXY (proxy), out_fd_list, res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(o)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * gxdp_open_uri_call_open_file_sync: + * @proxy: A #GXdpOpenURIProxy. + * @arg_parent_window: Argument to pass with the method invocation. + * @arg_fd: Argument to pass with the method invocation. + * @arg_options: Argument to pass with the method invocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenFile">OpenFile()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See gxdp_open_uri_call_open_file() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +gxdp_open_uri_call_open_file_sync ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + GVariant *arg_fd, + GVariant *arg_options, + GUnixFDList *fd_list, + gchar **out_handle, + GUnixFDList **out_fd_list, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_with_unix_fd_list_sync (G_DBUS_PROXY (proxy), + "OpenFile", + g_variant_new ("(s@h@a{sv})", + arg_parent_window, + arg_fd, + arg_options), + G_DBUS_CALL_FLAGS_NONE, + -1, + fd_list, + out_fd_list, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(o)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * gxdp_open_uri_complete_open_uri: + * @object: A #GXdpOpenURI. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @handle: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenURI">OpenURI()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +gxdp_open_uri_complete_open_uri ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + const gchar *handle) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("(o)", + handle)); +} + +/** + * gxdp_open_uri_complete_open_file: + * @object: A #GXdpOpenURI. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @fd_list: (allow-none): A #GUnixFDList or %NULL. + * @handle: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-freedesktop-portal-OpenURI.OpenFile">OpenFile()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +gxdp_open_uri_complete_open_file ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + const gchar *handle) +{ + g_dbus_method_invocation_return_value_with_unix_fd_list (invocation, + g_variant_new ("(o)", + handle), + fd_list); +} + +/* ------------------------------------------------------------------------ */ + +/** + * GXdpOpenURIProxy: + * + * The #GXdpOpenURIProxy structure contains only private data and should only be accessed using the provided API. + */ + +/** + * GXdpOpenURIProxyClass: + * @parent_class: The parent class. + * + * Class structure for #GXdpOpenURIProxy. + */ + +struct _GXdpOpenURIProxyPrivate +{ + GData *qdata; +}; + +static void gxdp_open_uri_proxy_iface_init (GXdpOpenURIIface *iface); + +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (GXdpOpenURIProxy, gxdp_open_uri_proxy, G_TYPE_DBUS_PROXY, + G_ADD_PRIVATE (GXdpOpenURIProxy) + G_IMPLEMENT_INTERFACE (GXDP_TYPE_OPEN_URI, gxdp_open_uri_proxy_iface_init)) + +#else +G_DEFINE_TYPE_WITH_CODE (GXdpOpenURIProxy, gxdp_open_uri_proxy, G_TYPE_DBUS_PROXY, + G_IMPLEMENT_INTERFACE (GXDP_TYPE_OPEN_URI, gxdp_open_uri_proxy_iface_init)) + +#endif +static void +gxdp_open_uri_proxy_finalize (GObject *object) +{ + GXdpOpenURIProxy *proxy = GXDP_OPEN_URI_PROXY (object); + g_datalist_clear (&proxy->priv->qdata); + G_OBJECT_CLASS (gxdp_open_uri_proxy_parent_class)->finalize (object); +} + +static void +gxdp_open_uri_proxy_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ + const _ExtendedGDBusPropertyInfo *info; + GVariant *variant; + g_assert (prop_id != 0 && prop_id - 1 < 1); + info = _gxdp_open_uri_property_info_pointers[prop_id - 1]; + variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); + if (info->use_gvariant) + { + g_value_set_variant (value, variant); + } + else + { + if (variant != NULL) + g_dbus_gvariant_to_gvalue (variant, value); + } + if (variant != NULL) + g_variant_unref (variant); +} + +static void +gxdp_open_uri_proxy_set_property_cb (GDBusProxy *proxy, + GAsyncResult *res, + gpointer user_data) +{ + const _ExtendedGDBusPropertyInfo *info = user_data; + GError *error; + GVariant *_ret; + error = NULL; + _ret = g_dbus_proxy_call_finish (proxy, res, &error); + if (!_ret) + { + g_warning ("Error setting property '%s' on interface org.freedesktop.portal.OpenURI: %s (%s, %d)", + info->parent_struct.name, + error->message, g_quark_to_string (error->domain), error->code); + g_error_free (error); + } + else + { + g_variant_unref (_ret); + } +} + +static void +gxdp_open_uri_proxy_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ + const _ExtendedGDBusPropertyInfo *info; + GVariant *variant; + g_assert (prop_id != 0 && prop_id - 1 < 1); + info = _gxdp_open_uri_property_info_pointers[prop_id - 1]; + variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_dbus_proxy_call (G_DBUS_PROXY (object), + "org.freedesktop.DBus.Properties.Set", + g_variant_new ("(ssv)", "org.freedesktop.portal.OpenURI", info->parent_struct.name, variant), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, (GAsyncReadyCallback) gxdp_open_uri_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct); + g_variant_unref (variant); +} + +static void +gxdp_open_uri_proxy_g_signal (GDBusProxy *proxy, + const gchar *sender_name G_GNUC_UNUSED, + const gchar *signal_name, + GVariant *parameters) +{ + _ExtendedGDBusSignalInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + gsize num_params; + gsize n; + guint signal_id; + info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct, signal_name); + if (info == NULL) + return; + num_params = g_variant_n_children (parameters); + paramv = g_new0 (GValue, num_params + 1); + g_value_init (¶mv[0], GXDP_TYPE_OPEN_URI); + g_value_set_object (¶mv[0], proxy); + g_variant_iter_init (&iter, parameters); + n = 1; + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, GXDP_TYPE_OPEN_URI); + g_signal_emitv (paramv, signal_id, 0, NULL); + for (n = 0; n < num_params + 1; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static void +gxdp_open_uri_proxy_g_properties_changed (GDBusProxy *_proxy, + GVariant *changed_properties, + const gchar *const *invalidated_properties) +{ + GXdpOpenURIProxy *proxy = GXDP_OPEN_URI_PROXY (_proxy); + guint n; + const gchar *key; + GVariantIter *iter; + _ExtendedGDBusPropertyInfo *info; + g_variant_get (changed_properties, "a{sv}", &iter); + while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct, key); + g_datalist_remove_data (&proxy->priv->qdata, key); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } + g_variant_iter_free (iter); + for (n = 0; invalidated_properties[n] != NULL; n++) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct, invalidated_properties[n]); + g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } +} + +static guint +gxdp_open_uri_proxy_get_version (GXdpOpenURI *object) +{ + GXdpOpenURIProxy *proxy = GXDP_OPEN_URI_PROXY (object); + GVariant *variant; + guint value = 0; + variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "version"); + if (variant != NULL) + { + value = g_variant_get_uint32 (variant); + g_variant_unref (variant); + } + return value; +} + +static void +gxdp_open_uri_proxy_init (GXdpOpenURIProxy *proxy) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + proxy->priv = gxdp_open_uri_proxy_get_instance_private (proxy); +#else + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GXDP_TYPE_OPEN_URI_PROXY, GXdpOpenURIProxyPrivate); +#endif + + g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gxdp_open_uri_interface_info ()); +} + +static void +gxdp_open_uri_proxy_class_init (GXdpOpenURIProxyClass *klass) +{ + GObjectClass *gobject_class; + GDBusProxyClass *proxy_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = gxdp_open_uri_proxy_finalize; + gobject_class->get_property = gxdp_open_uri_proxy_get_property; + gobject_class->set_property = gxdp_open_uri_proxy_set_property; + + proxy_class = G_DBUS_PROXY_CLASS (klass); + proxy_class->g_signal = gxdp_open_uri_proxy_g_signal; + proxy_class->g_properties_changed = gxdp_open_uri_proxy_g_properties_changed; + + gxdp_open_uri_override_properties (gobject_class, 1); + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (GXdpOpenURIProxyPrivate)); +#endif +} + +static void +gxdp_open_uri_proxy_iface_init (GXdpOpenURIIface *iface) +{ + iface->get_version = gxdp_open_uri_proxy_get_version; +} + +/** + * gxdp_open_uri_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link>. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. + * You can then call gxdp_open_uri_proxy_new_finish() to get the result of the operation. + * + * See gxdp_open_uri_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ +void +gxdp_open_uri_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (GXDP_TYPE_OPEN_URI_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.portal.OpenURI", NULL); +} + +/** + * gxdp_open_uri_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gxdp_open_uri_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with gxdp_open_uri_proxy_new(). + * + * Returns: (transfer full) (type GXdpOpenURIProxy): The constructed proxy object or %NULL if @error is set. + */ +GXdpOpenURI * +gxdp_open_uri_proxy_new_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return GXDP_OPEN_URI (ret); + else + return NULL; +} + +/** + * gxdp_open_uri_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link>. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See gxdp_open_uri_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type GXdpOpenURIProxy): The constructed proxy object or %NULL if @error is set. + */ +GXdpOpenURI * +gxdp_open_uri_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (GXDP_TYPE_OPEN_URI_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.portal.OpenURI", NULL); + if (ret != NULL) + return GXDP_OPEN_URI (ret); + else + return NULL; +} + + +/** + * gxdp_open_uri_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like gxdp_open_uri_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. + * You can then call gxdp_open_uri_proxy_new_for_bus_finish() to get the result of the operation. + * + * See gxdp_open_uri_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ +void +gxdp_open_uri_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (GXDP_TYPE_OPEN_URI_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.portal.OpenURI", NULL); +} + +/** + * gxdp_open_uri_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to gxdp_open_uri_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with gxdp_open_uri_proxy_new_for_bus(). + * + * Returns: (transfer full) (type GXdpOpenURIProxy): The constructed proxy object or %NULL if @error is set. + */ +GXdpOpenURI * +gxdp_open_uri_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return GXDP_OPEN_URI (ret); + else + return NULL; +} + +/** + * gxdp_open_uri_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like gxdp_open_uri_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See gxdp_open_uri_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type GXdpOpenURIProxy): The constructed proxy object or %NULL if @error is set. + */ +GXdpOpenURI * +gxdp_open_uri_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (GXDP_TYPE_OPEN_URI_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.portal.OpenURI", NULL); + if (ret != NULL) + return GXDP_OPEN_URI (ret); + else + return NULL; +} + + +/* ------------------------------------------------------------------------ */ + +/** + * GXdpOpenURISkeleton: + * + * The #GXdpOpenURISkeleton structure contains only private data and should only be accessed using the provided API. + */ + +/** + * GXdpOpenURISkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #GXdpOpenURISkeleton. + */ + +struct _GXdpOpenURISkeletonPrivate +{ + GValue *properties; + GList *changed_properties; + GSource *changed_properties_idle_source; + GMainContext *context; + GMutex lock; +}; + +static void +_gxdp_open_uri_skeleton_handle_method_call ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (user_data); + _ExtendedGDBusMethodInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + gsize num_params; + guint num_extra; + gsize n; + guint signal_id; + GValue return_value = G_VALUE_INIT; + info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); + g_assert (info != NULL); + num_params = g_variant_n_children (parameters); + num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); + n = 0; + g_value_init (¶mv[n], GXDP_TYPE_OPEN_URI); + g_value_set_object (¶mv[n++], skeleton); + g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); + g_value_set_object (¶mv[n++], invocation); + if (info->pass_fdlist) + { +#ifdef G_OS_UNIX + g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); + g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); +#else + g_assert_not_reached (); +#endif + } + g_variant_iter_init (&iter, parameters); + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, GXDP_TYPE_OPEN_URI); + g_value_init (&return_value, G_TYPE_BOOLEAN); + g_signal_emitv (paramv, signal_id, 0, &return_value); + if (!g_value_get_boolean (&return_value)) + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); + g_value_unset (&return_value); + for (n = 0; n < num_params + num_extra; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static GVariant * +_gxdp_open_uri_skeleton_handle_get_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GError **error, + gpointer user_data) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + GVariant *ret; + ret = NULL; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); + ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_value_unset (&value); + } + return ret; +} + +static gboolean +_gxdp_open_uri_skeleton_handle_set_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GVariant *variant, + GError **error, + gpointer user_data) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + gboolean ret; + ret = FALSE; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_gxdp_open_uri_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + if (info->use_gvariant) + g_value_set_variant (&value, variant); + else + g_dbus_gvariant_to_gvalue (variant, &value); + g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); + g_value_unset (&value); + ret = TRUE; + } + return ret; +} + +static const GDBusInterfaceVTable _gxdp_open_uri_skeleton_vtable = +{ + _gxdp_open_uri_skeleton_handle_method_call, + _gxdp_open_uri_skeleton_handle_get_property, + _gxdp_open_uri_skeleton_handle_set_property, + {NULL} +}; + +static GDBusInterfaceInfo * +gxdp_open_uri_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return gxdp_open_uri_interface_info (); +} + +static GDBusInterfaceVTable * +gxdp_open_uri_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return (GDBusInterfaceVTable *) &_gxdp_open_uri_skeleton_vtable; +} + +static GVariant * +gxdp_open_uri_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (_skeleton); + + GVariantBuilder builder; + guint n; + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + if (_gxdp_open_uri_interface_info.parent_struct.properties == NULL) + goto out; + for (n = 0; _gxdp_open_uri_interface_info.parent_struct.properties[n] != NULL; n++) + { + GDBusPropertyInfo *info = _gxdp_open_uri_interface_info.parent_struct.properties[n]; + if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) + { + GVariant *value; + value = _gxdp_open_uri_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.portal.OpenURI", info->name, NULL, skeleton); + if (value != NULL) + { + g_variant_take_ref (value); + g_variant_builder_add (&builder, "{sv}", info->name, value); + g_variant_unref (value); + } + } + } +out: + return g_variant_builder_end (&builder); +} + +static gboolean _gxdp_open_uri_emit_changed (gpointer user_data); + +static void +gxdp_open_uri_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (_skeleton); + gboolean emit_changed = FALSE; + + g_mutex_lock (&skeleton->priv->lock); + if (skeleton->priv->changed_properties_idle_source != NULL) + { + g_source_destroy (skeleton->priv->changed_properties_idle_source); + skeleton->priv->changed_properties_idle_source = NULL; + emit_changed = TRUE; + } + g_mutex_unlock (&skeleton->priv->lock); + + if (emit_changed) + _gxdp_open_uri_emit_changed (skeleton); +} + +static void gxdp_open_uri_skeleton_iface_init (GXdpOpenURIIface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (GXdpOpenURISkeleton, gxdp_open_uri_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_ADD_PRIVATE (GXdpOpenURISkeleton) + G_IMPLEMENT_INTERFACE (GXDP_TYPE_OPEN_URI, gxdp_open_uri_skeleton_iface_init)) + +#else +G_DEFINE_TYPE_WITH_CODE (GXdpOpenURISkeleton, gxdp_open_uri_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_IMPLEMENT_INTERFACE (GXDP_TYPE_OPEN_URI, gxdp_open_uri_skeleton_iface_init)) + +#endif +static void +gxdp_open_uri_skeleton_finalize (GObject *object) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (object); + guint n; + for (n = 0; n < 1; n++) + g_value_unset (&skeleton->priv->properties[n]); + g_free (skeleton->priv->properties); + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + if (skeleton->priv->changed_properties_idle_source != NULL) + g_source_destroy (skeleton->priv->changed_properties_idle_source); + g_main_context_unref (skeleton->priv->context); + g_mutex_clear (&skeleton->priv->lock); + G_OBJECT_CLASS (gxdp_open_uri_skeleton_parent_class)->finalize (object); +} + +static void +gxdp_open_uri_skeleton_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (object); + g_assert (prop_id != 0 && prop_id - 1 < 1); + g_mutex_lock (&skeleton->priv->lock); + g_value_copy (&skeleton->priv->properties[prop_id - 1], value); + g_mutex_unlock (&skeleton->priv->lock); +} + +static gboolean +_gxdp_open_uri_emit_changed (gpointer user_data) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (user_data); + GList *l; + GVariantBuilder builder; + GVariantBuilder invalidated_builder; + guint num_changes; + + g_mutex_lock (&skeleton->priv->lock); + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as")); + for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next) + { + ChangedProperty *cp = l->data; + GVariant *variant; + const GValue *cur_value; + + cur_value = &skeleton->priv->properties[cp->prop_id - 1]; + if (!_g_value_equal (cur_value, &cp->orig_value)) + { + variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature)); + g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant); + g_variant_unref (variant); + num_changes++; + } + } + if (num_changes > 0) + { + GList *connections, *ll; + GVariant *signal_variant; + signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.portal.OpenURI", + &builder, &invalidated_builder)); + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + for (ll = connections; ll != NULL; ll = ll->next) + { + GDBusConnection *connection = ll->data; + + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), + "org.freedesktop.DBus.Properties", + "PropertiesChanged", + signal_variant, + NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); + } + else + { + g_variant_builder_clear (&builder); + g_variant_builder_clear (&invalidated_builder); + } + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + skeleton->priv->changed_properties = NULL; + skeleton->priv->changed_properties_idle_source = NULL; + g_mutex_unlock (&skeleton->priv->lock); + return FALSE; +} + +static void +_gxdp_open_uri_schedule_emit_changed (GXdpOpenURISkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value) +{ + ChangedProperty *cp; + GList *l; + cp = NULL; + for (l = skeleton->priv->changed_properties; l != NULL; l = l->next) + { + ChangedProperty *i_cp = l->data; + if (i_cp->info == info) + { + cp = i_cp; + break; + } + } + if (cp == NULL) + { + cp = g_new0 (ChangedProperty, 1); + cp->prop_id = prop_id; + cp->info = info; + skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp); + g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value)); + g_value_copy (orig_value, &cp->orig_value); + } +} + +static void +gxdp_open_uri_skeleton_notify (GObject *object, + GParamSpec *pspec G_GNUC_UNUSED) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (object); + g_mutex_lock (&skeleton->priv->lock); + if (skeleton->priv->changed_properties != NULL && + skeleton->priv->changed_properties_idle_source == NULL) + { + skeleton->priv->changed_properties_idle_source = g_idle_source_new (); + g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT); + g_source_set_callback (skeleton->priv->changed_properties_idle_source, _gxdp_open_uri_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref); + g_source_set_name (skeleton->priv->changed_properties_idle_source, "[generated] _gxdp_open_uri_emit_changed"); + g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context); + g_source_unref (skeleton->priv->changed_properties_idle_source); + } + g_mutex_unlock (&skeleton->priv->lock); +} + +static void +gxdp_open_uri_skeleton_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (object); + g_assert (prop_id != 0 && prop_id - 1 < 1); + g_mutex_lock (&skeleton->priv->lock); + g_object_freeze_notify (object); + if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) + { + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) + _gxdp_open_uri_schedule_emit_changed (skeleton, _gxdp_open_uri_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); + g_object_notify_by_pspec (object, pspec); + } + g_mutex_unlock (&skeleton->priv->lock); + g_object_thaw_notify (object); +} + +static void +gxdp_open_uri_skeleton_init (GXdpOpenURISkeleton *skeleton) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + skeleton->priv = gxdp_open_uri_skeleton_get_instance_private (skeleton); +#else + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GXDP_TYPE_OPEN_URI_SKELETON, GXdpOpenURISkeletonPrivate); +#endif + + g_mutex_init (&skeleton->priv->lock); + skeleton->priv->context = g_main_context_ref_thread_default (); + skeleton->priv->properties = g_new0 (GValue, 1); + g_value_init (&skeleton->priv->properties[0], G_TYPE_UINT); +} + +static guint +gxdp_open_uri_skeleton_get_version (GXdpOpenURI *object) +{ + GXdpOpenURISkeleton *skeleton = GXDP_OPEN_URI_SKELETON (object); + guint value; + g_mutex_lock (&skeleton->priv->lock); + value = g_value_get_uint (&(skeleton->priv->properties[0])); + g_mutex_unlock (&skeleton->priv->lock); + return value; +} + +static void +gxdp_open_uri_skeleton_class_init (GXdpOpenURISkeletonClass *klass) +{ + GObjectClass *gobject_class; + GDBusInterfaceSkeletonClass *skeleton_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = gxdp_open_uri_skeleton_finalize; + gobject_class->get_property = gxdp_open_uri_skeleton_get_property; + gobject_class->set_property = gxdp_open_uri_skeleton_set_property; + gobject_class->notify = gxdp_open_uri_skeleton_notify; + + + gxdp_open_uri_override_properties (gobject_class, 1); + + skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); + skeleton_class->get_info = gxdp_open_uri_skeleton_dbus_interface_get_info; + skeleton_class->get_properties = gxdp_open_uri_skeleton_dbus_interface_get_properties; + skeleton_class->flush = gxdp_open_uri_skeleton_dbus_interface_flush; + skeleton_class->get_vtable = gxdp_open_uri_skeleton_dbus_interface_get_vtable; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (GXdpOpenURISkeletonPrivate)); +#endif +} + +static void +gxdp_open_uri_skeleton_iface_init (GXdpOpenURIIface *iface) +{ + iface->get_version = gxdp_open_uri_skeleton_get_version; +} + +/** + * gxdp_open_uri_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-freedesktop-portal-OpenURI.top_of_page">org.freedesktop.portal.OpenURI</link>. + * + * Returns: (transfer full) (type GXdpOpenURISkeleton): The skeleton object. + */ +GXdpOpenURI * +gxdp_open_uri_skeleton_new (void) +{ + return GXDP_OPEN_URI (g_object_new (GXDP_TYPE_OPEN_URI_SKELETON, NULL)); +} + +/* ------------------------------------------------------------------------ * Code for interface org.freedesktop.portal.NetworkMonitor * ------------------------------------------------------------------------ */ diff --git a/gio/xdp-dbus.h b/gio/xdp-dbus.h index dc93a754c..3d8753f58 100644 --- a/gio/xdp-dbus.h +++ b/gio/xdp-dbus.h @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.53.2. DO NOT EDIT. + * Generated by gdbus-codegen 2.53.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -28,6 +28,7 @@ struct _GXdpDocumentsIface { GTypeInterface parent_iface; + gboolean (*handle_add) ( GXdpDocuments *object, GDBusMethodInvocation *invocation, @@ -36,6 +37,15 @@ struct _GXdpDocumentsIface gboolean arg_reuse_existing, gboolean arg_persistent); + gboolean (*handle_add_full) ( + GXdpDocuments *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + GVariant *arg_o_path_fds, + guint arg_flags, + const gchar *arg_app_id, + const gchar *const *arg_permissions); + gboolean (*handle_add_named) ( GXdpDocuments *object, GDBusMethodInvocation *invocation, @@ -83,6 +93,8 @@ struct _GXdpDocumentsIface const gchar *arg_app_id, const gchar *const *arg_permissions); + guint (*get_version) (GXdpDocuments *object); + }; GType gxdp_documents_get_type (void) G_GNUC_CONST; @@ -109,6 +121,13 @@ void gxdp_documents_complete_add_named ( GUnixFDList *fd_list, const gchar *doc_id); +void gxdp_documents_complete_add_full ( + GXdpDocuments *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + const gchar *const *doc_ids, + GVariant *extra_out); + void gxdp_documents_complete_grant_permissions ( GXdpDocuments *object, GDBusMethodInvocation *invocation); @@ -216,6 +235,38 @@ gboolean gxdp_documents_call_add_named_sync ( GCancellable *cancellable, GError **error); +void gxdp_documents_call_add_full ( + GXdpDocuments *proxy, + GVariant *arg_o_path_fds, + guint arg_flags, + const gchar *arg_app_id, + const gchar *const *arg_permissions, + GUnixFDList *fd_list, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean gxdp_documents_call_add_full_finish ( + GXdpDocuments *proxy, + gchar ***out_doc_ids, + GVariant **out_extra_out, + GUnixFDList **out_fd_list, + GAsyncResult *res, + GError **error); + +gboolean gxdp_documents_call_add_full_sync ( + GXdpDocuments *proxy, + GVariant *arg_o_path_fds, + guint arg_flags, + const gchar *arg_app_id, + const gchar *const *arg_permissions, + GUnixFDList *fd_list, + gchar ***out_doc_ids, + GVariant **out_extra_out, + GUnixFDList **out_fd_list, + GCancellable *cancellable, + GError **error); + void gxdp_documents_call_grant_permissions ( GXdpDocuments *proxy, const gchar *arg_doc_id, @@ -342,6 +393,11 @@ gboolean gxdp_documents_call_list_sync ( +/* D-Bus property accessors: */ +guint gxdp_documents_get_version (GXdpDocuments *object); +void gxdp_documents_set_version (GXdpDocuments *object, guint value); + + /* ---- */ #define GXDP_TYPE_DOCUMENTS_PROXY (gxdp_documents_proxy_get_type ()) @@ -447,6 +503,226 @@ GXdpDocuments *gxdp_documents_skeleton_new (void); /* ------------------------------------------------------------------------ */ +/* Declarations for org.freedesktop.portal.OpenURI */ + +#define GXDP_TYPE_OPEN_URI (gxdp_open_uri_get_type ()) +#define GXDP_OPEN_URI(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GXDP_TYPE_OPEN_URI, GXdpOpenURI)) +#define GXDP_IS_OPEN_URI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GXDP_TYPE_OPEN_URI)) +#define GXDP_OPEN_URI_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GXDP_TYPE_OPEN_URI, GXdpOpenURIIface)) + +struct _GXdpOpenURI; +typedef struct _GXdpOpenURI GXdpOpenURI; +typedef struct _GXdpOpenURIIface GXdpOpenURIIface; + +struct _GXdpOpenURIIface +{ + GTypeInterface parent_iface; + + + gboolean (*handle_open_file) ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + const gchar *arg_parent_window, + GVariant *arg_fd, + GVariant *arg_options); + + gboolean (*handle_open_uri) ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + const gchar *arg_parent_window, + const gchar *arg_uri, + GVariant *arg_options); + + guint (*get_version) (GXdpOpenURI *object); + +}; + +GType gxdp_open_uri_get_type (void) G_GNUC_CONST; + +GDBusInterfaceInfo *gxdp_open_uri_interface_info (void); +guint gxdp_open_uri_override_properties (GObjectClass *klass, guint property_id_begin); + + +/* D-Bus method call completion functions: */ +void gxdp_open_uri_complete_open_uri ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + const gchar *handle); + +void gxdp_open_uri_complete_open_file ( + GXdpOpenURI *object, + GDBusMethodInvocation *invocation, + GUnixFDList *fd_list, + const gchar *handle); + + + +/* D-Bus method calls: */ +void gxdp_open_uri_call_open_uri ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + const gchar *arg_uri, + GVariant *arg_options, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean gxdp_open_uri_call_open_uri_finish ( + GXdpOpenURI *proxy, + gchar **out_handle, + GAsyncResult *res, + GError **error); + +gboolean gxdp_open_uri_call_open_uri_sync ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + const gchar *arg_uri, + GVariant *arg_options, + gchar **out_handle, + GCancellable *cancellable, + GError **error); + +void gxdp_open_uri_call_open_file ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + GVariant *arg_fd, + GVariant *arg_options, + GUnixFDList *fd_list, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean gxdp_open_uri_call_open_file_finish ( + GXdpOpenURI *proxy, + gchar **out_handle, + GUnixFDList **out_fd_list, + GAsyncResult *res, + GError **error); + +gboolean gxdp_open_uri_call_open_file_sync ( + GXdpOpenURI *proxy, + const gchar *arg_parent_window, + GVariant *arg_fd, + GVariant *arg_options, + GUnixFDList *fd_list, + gchar **out_handle, + GUnixFDList **out_fd_list, + GCancellable *cancellable, + GError **error); + + + +/* D-Bus property accessors: */ +guint gxdp_open_uri_get_version (GXdpOpenURI *object); +void gxdp_open_uri_set_version (GXdpOpenURI *object, guint value); + + +/* ---- */ + +#define GXDP_TYPE_OPEN_URI_PROXY (gxdp_open_uri_proxy_get_type ()) +#define GXDP_OPEN_URI_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GXDP_TYPE_OPEN_URI_PROXY, GXdpOpenURIProxy)) +#define GXDP_OPEN_URI_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GXDP_TYPE_OPEN_URI_PROXY, GXdpOpenURIProxyClass)) +#define GXDP_OPEN_URI_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GXDP_TYPE_OPEN_URI_PROXY, GXdpOpenURIProxyClass)) +#define GXDP_IS_OPEN_URI_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GXDP_TYPE_OPEN_URI_PROXY)) +#define GXDP_IS_OPEN_URI_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GXDP_TYPE_OPEN_URI_PROXY)) + +typedef struct _GXdpOpenURIProxy GXdpOpenURIProxy; +typedef struct _GXdpOpenURIProxyClass GXdpOpenURIProxyClass; +typedef struct _GXdpOpenURIProxyPrivate GXdpOpenURIProxyPrivate; + +struct _GXdpOpenURIProxy +{ + /*< private >*/ + GDBusProxy parent_instance; + GXdpOpenURIProxyPrivate *priv; +}; + +struct _GXdpOpenURIProxyClass +{ + GDBusProxyClass parent_class; +}; + +GType gxdp_open_uri_proxy_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GXdpOpenURIProxy, g_object_unref) +#endif + +void gxdp_open_uri_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GXdpOpenURI *gxdp_open_uri_proxy_new_finish ( + GAsyncResult *res, + GError **error); +GXdpOpenURI *gxdp_open_uri_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + +void gxdp_open_uri_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GXdpOpenURI *gxdp_open_uri_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error); +GXdpOpenURI *gxdp_open_uri_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + + +/* ---- */ + +#define GXDP_TYPE_OPEN_URI_SKELETON (gxdp_open_uri_skeleton_get_type ()) +#define GXDP_OPEN_URI_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GXDP_TYPE_OPEN_URI_SKELETON, GXdpOpenURISkeleton)) +#define GXDP_OPEN_URI_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GXDP_TYPE_OPEN_URI_SKELETON, GXdpOpenURISkeletonClass)) +#define GXDP_OPEN_URI_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GXDP_TYPE_OPEN_URI_SKELETON, GXdpOpenURISkeletonClass)) +#define GXDP_IS_OPEN_URI_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GXDP_TYPE_OPEN_URI_SKELETON)) +#define GXDP_IS_OPEN_URI_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GXDP_TYPE_OPEN_URI_SKELETON)) + +typedef struct _GXdpOpenURISkeleton GXdpOpenURISkeleton; +typedef struct _GXdpOpenURISkeletonClass GXdpOpenURISkeletonClass; +typedef struct _GXdpOpenURISkeletonPrivate GXdpOpenURISkeletonPrivate; + +struct _GXdpOpenURISkeleton +{ + /*< private >*/ + GDBusInterfaceSkeleton parent_instance; + GXdpOpenURISkeletonPrivate *priv; +}; + +struct _GXdpOpenURISkeletonClass +{ + GDBusInterfaceSkeletonClass parent_class; +}; + +GType gxdp_open_uri_skeleton_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GXdpOpenURISkeleton, g_object_unref) +#endif + +GXdpOpenURI *gxdp_open_uri_skeleton_new (void); + + +/* ------------------------------------------------------------------------ */ /* Declarations for org.freedesktop.portal.NetworkMonitor */ #define GXDP_TYPE_NETWORK_MONITOR (gxdp_network_monitor_get_type ()) diff --git a/glib-tap.mk b/glib-tap.mk index 9a3a445bd..5f25b620a 100644 --- a/glib-tap.mk +++ b/glib-tap.mk @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -TESTS_ENVIRONMENT= \ +AM_TESTS_ENVIRONMENT= \ G_TEST_SRCDIR="$(abs_srcdir)" \ G_TEST_BUILDDIR="$(abs_builddir)" \ G_DEBUG=gc-friendly \ diff --git a/glib/deprecated/gallocator.c b/glib/deprecated/gallocator.c index 2a8111cbb..ad9695aea 100644 --- a/glib/deprecated/gallocator.c +++ b/glib/deprecated/gallocator.c @@ -2,7 +2,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gallocator.h b/glib/deprecated/gallocator.h index 39850757f..005e92b6e 100644 --- a/glib/deprecated/gallocator.h +++ b/glib/deprecated/gallocator.h @@ -2,7 +2,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gcache.c b/glib/deprecated/gcache.c index d91bdfcb5..7056c13ac 100644 --- a/glib/deprecated/gcache.c +++ b/glib/deprecated/gcache.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gcache.h b/glib/deprecated/gcache.h index 5865978fb..2885697f9 100644 --- a/glib/deprecated/gcache.h +++ b/glib/deprecated/gcache.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gcompletion.c b/glib/deprecated/gcompletion.c index 928d83e50..a62aa8b40 100644 --- a/glib/deprecated/gcompletion.c +++ b/glib/deprecated/gcompletion.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gcompletion.h b/glib/deprecated/gcompletion.h index 8b9afd975..2fd1f0393 100644 --- a/glib/deprecated/gcompletion.h +++ b/glib/deprecated/gcompletion.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h index 453699d32..d14dd0ed3 100644 --- a/glib/deprecated/gmain.h +++ b/glib/deprecated/gmain.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/grel.c b/glib/deprecated/grel.c index 87cdf5cf0..32ec37ca8 100644 --- a/glib/deprecated/grel.c +++ b/glib/deprecated/grel.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/grel.h b/glib/deprecated/grel.h index bc26dd13f..3a65240c1 100644 --- a/glib/deprecated/grel.h +++ b/glib/deprecated/grel.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c index 1dec7194a..c0ef4deff 100644 --- a/glib/deprecated/gthread-deprecated.c +++ b/glib/deprecated/gthread-deprecated.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h index 4c7b30415..d0814a875 100644 --- a/glib/deprecated/gthread.h +++ b/glib/deprecated/gthread.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/docs.c b/glib/docs.c index 5ac735448..da236231e 100644 --- a/glib/docs.c +++ b/glib/docs.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/galloca.h b/glib/galloca.h index 483a6c805..47151ee8b 100644 --- a/glib/galloca.h +++ b/glib/galloca.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/garray.c b/glib/garray.c index e4a45466d..c05b187f9 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/garray.h b/glib/garray.h index 8b3b7980d..3490f14f0 100644 --- a/glib/garray.h +++ b/glib/garray.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c index aff2f02fe..8529beb8b 100644 --- a/glib/gasyncqueue.c +++ b/glib/gasyncqueue.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h index 0c71e14bd..05980a777 100644 --- a/glib/gasyncqueue.h +++ b/glib/gasyncqueue.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gasyncqueueprivate.h b/glib/gasyncqueueprivate.h index bff9ecc5d..b1622c54c 100644 --- a/glib/gasyncqueueprivate.h +++ b/glib/gasyncqueueprivate.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gatomic.c b/glib/gatomic.c index e3e49fab4..2c1faeeef 100644 --- a/glib/gatomic.c +++ b/glib/gatomic.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Ryan Lortie * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gatomic.h b/glib/gatomic.h index 32d0d1e7e..8609a2fd3 100644 --- a/glib/gatomic.h +++ b/glib/gatomic.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Ryan Lortie * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c index d231b5a5a..db2bf05d2 100644 --- a/glib/gbacktrace.c +++ b/glib/gbacktrace.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h index 1a4f534ab..96d450584 100644 --- a/glib/gbacktrace.h +++ b/glib/gbacktrace.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbase64.c b/glib/gbase64.c index 4dc151873..651840e52 100644 --- a/glib/gbase64.c +++ b/glib/gbase64.c @@ -4,17 +4,17 @@ * Copyright (C) 2000-2003 Ximian Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * This is based on code in camel, written by: * Michael Zucchi <notzed@ximian.com> diff --git a/glib/gbase64.h b/glib/gbase64.h index 4018f0d2a..662c597ff 100644 --- a/glib/gbase64.h +++ b/glib/gbase64.h @@ -3,17 +3,17 @@ * Copyright (C) 2005 Alexander Larsson <alexl@redhat.com> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_BASE64_H__ diff --git a/glib/gbitlock.c b/glib/gbitlock.c index d5b4dac62..46e5f7d06 100644 --- a/glib/gbitlock.c +++ b/glib/gbitlock.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbitlock.h b/glib/gbitlock.h index 5fab49494..8054bc8ae 100644 --- a/glib/gbitlock.h +++ b/glib/gbitlock.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 6a05623ff..7d7da0399 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -3,16 +3,16 @@ * Copyright (C) 2005-2006 Emmanuele Bassi * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this library; if not, see <http://www.gnu.org/licenses/>. */ diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h index 3f9b88a1d..b87d27e08 100644 --- a/glib/gbookmarkfile.h +++ b/glib/gbookmarkfile.h @@ -3,16 +3,16 @@ * Copyright (C) 2005-2006 Emmanuele Bassi * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this library; if not, see <http://www.gnu.org/licenses/>. */ diff --git a/glib/gbytes.c b/glib/gbytes.c index b9ca4eb04..a68b17d04 100644 --- a/glib/gbytes.c +++ b/glib/gbytes.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gbytes.h b/glib/gbytes.h index 24f1856fb..0bb1517b9 100644 --- a/glib/gbytes.h +++ b/glib/gbytes.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gcharset.c b/glib/gcharset.c index d47541cba..9d25db584 100644 --- a/glib/gcharset.c +++ b/glib/gcharset.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gcharset.h b/glib/gcharset.h index dacc6ba9c..fccedc7c3 100644 --- a/glib/gcharset.h +++ b/glib/gcharset.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gcharsetprivate.h b/glib/gcharsetprivate.h index 1529423d5..f6b68dcd7 100644 --- a/glib/gcharsetprivate.h +++ b/glib/gcharsetprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gchecksum.c b/glib/gchecksum.c index 18efca0ed..40b1d50e2 100644 --- a/glib/gchecksum.c +++ b/glib/gchecksum.c @@ -3,17 +3,17 @@ * Copyright (C) 2007 Emmanuele Bassi <ebassi@gnome.org> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" diff --git a/glib/gchecksum.h b/glib/gchecksum.h index 06af16c1b..599f439c1 100644 --- a/glib/gchecksum.h +++ b/glib/gchecksum.h @@ -3,17 +3,17 @@ * Copyright (C) 2007 Emmanuele Bassi <ebassi@gnome.org> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_CHECKSUM_H__ diff --git a/glib/gconvert.c b/glib/gconvert.c index 6e5a7cf9d..64fd98107 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gconvert.h b/glib/gconvert.h index c2419415d..ab6ab4f6b 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdataset.c b/glib/gdataset.c index df75c81a1..28ec0c0b5 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdataset.h b/glib/gdataset.h index d8d59c98d..89a34c71a 100644 --- a/glib/gdataset.h +++ b/glib/gdataset.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h index 4f98040c1..eb95278f1 100644 --- a/glib/gdatasetprivate.h +++ b/glib/gdatasetprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdate.c b/glib/gdate.c index bea2448df..1519cf024 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdate.h b/glib/gdate.h index ff4b8c14f..bc7e93120 100644 --- a/glib/gdate.h +++ b/glib/gdate.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdir.c b/glib/gdir.c index 4f7383785..cb4ad0b2f 100644 --- a/glib/gdir.c +++ b/glib/gdir.c @@ -9,7 +9,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gdir.h b/glib/gdir.h index 531ed95d4..8f9d6bd7c 100644 --- a/glib/gdir.h +++ b/glib/gdir.h @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/genviron.c b/glib/genviron.c index 4b40050de..aa4681753 100644 --- a/glib/genviron.c +++ b/glib/genviron.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/genviron.h b/glib/genviron.h index 3e2b4b056..c4bf01a5a 100644 --- a/glib/genviron.h +++ b/glib/genviron.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gerror.c b/glib/gerror.c index 380382b33..fc7e2bd33 100644 --- a/glib/gerror.c +++ b/glib/gerror.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gerror.h b/glib/gerror.h index 34d7b0fea..8ecff04e1 100644 --- a/glib/gerror.h +++ b/glib/gerror.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gfileutils.c b/glib/gfileutils.c index ca330faaf..e52f284eb 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gfileutils.h b/glib/gfileutils.h index f5f0827af..fd119d737 100644 --- a/glib/gfileutils.h +++ b/glib/gfileutils.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ggettext.c b/glib/ggettext.c index 19f5f4178..a5223ceb9 100644 --- a/glib/ggettext.c +++ b/glib/ggettext.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ggettext.h b/glib/ggettext.h index 96cc6ac66..036f9d534 100644 --- a/glib/ggettext.h +++ b/glib/ggettext.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghash.c b/glib/ghash.c index 01c495e53..d3c6c6e8c 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghash.h b/glib/ghash.h index d353088d1..5c8cb9195 100644 --- a/glib/ghash.h +++ b/glib/ghash.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghmac.c b/glib/ghmac.c index dd4c79e48..9b58fd81c 100644 --- a/glib/ghmac.c +++ b/glib/ghmac.c @@ -3,17 +3,17 @@ * Copyright (C) 2011 Collabora Ltd. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. * * Author: Stef Walter <stefw@collabora.co.uk> */ diff --git a/glib/ghmac.h b/glib/ghmac.h index e099a081a..36e24eb29 100644 --- a/glib/ghmac.h +++ b/glib/ghmac.h @@ -3,17 +3,17 @@ * Copyright (C) 2011 Stef Walter <stefw@collabora.co.uk> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_HMAC_H__ diff --git a/glib/ghook.c b/glib/ghook.c index 588f45154..39550e2d2 100644 --- a/glib/ghook.c +++ b/glib/ghook.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghook.h b/glib/ghook.h index f0b6516a1..83ad1bdef 100644 --- a/glib/ghook.h +++ b/glib/ghook.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghostutils.c b/glib/ghostutils.c index 4be59f7ee..1b497205a 100644 --- a/glib/ghostutils.c +++ b/glib/ghostutils.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/ghostutils.h b/glib/ghostutils.h index 4c478810c..59d2d41ed 100644 --- a/glib/ghostutils.h +++ b/glib/ghostutils.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h index 150a2686d..74e50a3a8 100644 --- a/glib/gi18n-lib.h +++ b/glib/gi18n-lib.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gi18n.h b/glib/gi18n.h index f765c3dae..5f996d24e 100644 --- a/glib/gi18n.h +++ b/glib/gi18n.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/giochannel.c b/glib/giochannel.c index 1a3c76b58..bdbaa5e02 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/giochannel.h b/glib/giochannel.h index cb55c04e8..1da90ef6d 100644 --- a/glib/giochannel.h +++ b/glib/giochannel.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/giounix.c b/glib/giounix.c index bb773c3c5..af80a2c0b 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/giowin32.c b/glib/giowin32.c index e659585dc..f150f7b39 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -9,7 +9,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 34814663a..9831fbe6c 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -10,7 +10,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h index 8e7bfb9dd..7da710763 100644 --- a/glib/gkeyfile.h +++ b/glib/gkeyfile.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h index 6355f7565..9f86bd99c 100644 --- a/glib/glib-autocleanups.h +++ b/glib/glib-autocleanups.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-init.c b/glib/glib-init.c index 30a965405..5f312113a 100644 --- a/glib/glib-init.c +++ b/glib/glib-init.c @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Limited * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-init.h b/glib/glib-init.h index 0cab67fdc..5da33c052 100644 --- a/glib/glib-init.h +++ b/glib/glib-init.h @@ -1,10 +1,10 @@ /* * Copyright © 2011 Canonical Limited * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-object.h b/glib/glib-object.h index 6ad523eec..355623391 100644 --- a/glib/glib-object.h +++ b/glib/glib-object.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-private.c b/glib/glib-private.c index 3dbf74492..290cc8dbd 100644 --- a/glib/glib-private.c +++ b/glib/glib-private.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-private.h b/glib/glib-private.h index 198e07f45..84f42dfbb 100644 --- a/glib/glib-private.h +++ b/glib/glib-private.h @@ -2,17 +2,17 @@ * Copyright (C) 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __GLIB_PRIVATE_H__ diff --git a/glib/glib-unix.c b/glib/glib-unix.c index d666a0646..a456357d5 100644 --- a/glib/glib-unix.c +++ b/glib/glib-unix.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib-unix.h b/glib/glib-unix.h index 55469439d..ef8702d79 100644 --- a/glib/glib-unix.h +++ b/glib/glib-unix.h @@ -2,17 +2,17 @@ * Copyright (C) 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_UNIX_H__ diff --git a/glib/glib.h b/glib/glib.h index 9fd22298a..4f5a7f702 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glib.rc b/glib/glib.rc index 388b4ad44..0d4b18a51 100644 --- a/glib/glib.rc +++ b/glib/glib.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,2,0 - PRODUCTVERSION 2,53,2,0 + FILEVERSION 2,53,3,0 + PRODUCTVERSION 2,53,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GLib" - VALUE "FileVersion", "2.53.2.0" + VALUE "FileVersion", "2.53.3.0" VALUE "InternalName", "libglib-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald and others." VALUE "OriginalFilename", "libglib-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.2" + VALUE "ProductVersion", "2.53.3" END END BLOCK "VarFileInfo" diff --git a/glib/glib_trace.h b/glib/glib_trace.h index 3818374c0..1876738cf 100644 --- a/glib/glib_trace.h +++ b/glib/glib_trace.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glibconfig.h.win32 b/glib/glibconfig.h.win32 index d906e5cb0..578db427f 100644 --- a/glib/glibconfig.h.win32 +++ b/glib/glibconfig.h.win32 @@ -162,15 +162,15 @@ typedef unsigned __int64 guintptr; #define GLIB_MAJOR_VERSION 2 #define GLIB_MINOR_VERSION 53 -#define GLIB_MICRO_VERSION 2 +#define GLIB_MICRO_VERSION 3 #define G_OS_WIN32 #define G_PLATFORM_WIN32 -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#endif /* not _MSC_VER */ +#endif /* not _MSC_VER or 2013 or later */ #ifndef _MSC_VER #define G_HAVE_ISO_VARARGS 1 diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in index ab7e68d04..9a91c5e96 100644 --- a/glib/glibconfig.h.win32.in +++ b/glib/glibconfig.h.win32.in @@ -168,9 +168,9 @@ typedef unsigned __int64 guintptr; #define G_PLATFORM_WIN32 @GLIB_WIN32_STATIC_COMPILATION_DEFINE@ -#ifndef _MSC_VER +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) #define G_VA_COPY va_copy -#endif /* not _MSC_VER */ +#endif /* not _MSC_VER or 2013 or later */ #ifndef _MSC_VER #define G_HAVE_ISO_VARARGS 1 diff --git a/glib/glist.c b/glib/glist.c index 527f89c31..e0f9453ab 100644 --- a/glib/glist.c +++ b/glib/glist.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/glist.h b/glib/glist.h index bf5614ed7..af35cd52c 100644 --- a/glib/glist.h +++ b/glib/glist.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmacros.h b/glib/gmacros.h index 75834795a..ceb74289a 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmain-internal.h b/glib/gmain-internal.h index a9cd70d00..5a01599d9 100644 --- a/glib/gmain-internal.h +++ b/glib/gmain-internal.h @@ -2,17 +2,17 @@ * Copyright (C) 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_MAIN_INTERNAL_H__ diff --git a/glib/gmain.c b/glib/gmain.c index 7a5ec1f45..41dd0f6cc 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -2680,131 +2680,45 @@ g_get_real_time (void) * Since: 2.28 **/ #if defined (G_OS_WIN32) -static ULONGLONG (*g_GetTickCount64) (void) = NULL; -static guint32 g_win32_tick_epoch = 0; +/* NOTE: + * time_usec = ticks_since_boot * usec_per_sec / ticks_per_sec + * + * Doing (ticks_since_boot * usec_per_sec) before the division can overflow 64 bits + * (ticks_since_boot / ticks_per_sec) and then multiply would not be accurate enough. + * So for now we calculate (usec_per_sec / ticks_per_sec) and use floating point + */ +static gdouble g_monotonic_usec_per_tick = 0; void g_clock_win32_init (void) { - HMODULE kernel32; + LARGE_INTEGER freq; + + if (!QueryPerformanceFrequency (&freq) || freq.QuadPart == 0) + { + /* The documentation says that this should never happen */ + g_assert_not_reached (); + return; + } - g_GetTickCount64 = NULL; - kernel32 = GetModuleHandle ("KERNEL32.DLL"); - if (kernel32 != NULL) - g_GetTickCount64 = (void *) GetProcAddress (kernel32, "GetTickCount64"); - g_win32_tick_epoch = ((guint32)GetTickCount()) >> 31; + g_monotonic_usec_per_tick = (gdouble)G_USEC_PER_SEC / freq.QuadPart; } gint64 g_get_monotonic_time (void) { - guint64 ticks; - guint32 ticks32; - - /* There are four sources for the monotonic time on Windows: - * - * Three are based on a (1 msec accuracy, but only read periodically) clock chip: - * - GetTickCount (GTC) - * 32bit msec counter, updated each ~15msec, wraps in ~50 days - * - GetTickCount64 (GTC64) - * Same as GetTickCount, but extended to 64bit, so no wrap - * Only available in Vista or later - * - timeGetTime (TGT) - * similar to GetTickCount by default: 15msec, 50 day wrap. - * available in winmm.dll (thus known as the multimedia timers) - * However apps can raise the system timer clock frequency using timeBeginPeriod() - * increasing the accuracy up to 1 msec, at a cost in general system performance - * and battery use. - * - * One is based on high precision clocks: - * - QueryPrecisionCounter (QPC) - * This has much higher accuracy, but is not guaranteed monotonic, and - * has lots of complications like clock jumps and different times on different - * CPUs. It also has lower long term accuracy (i.e. it will drift compared to - * the low precision clocks. - * - * Additionally, the precision available in the timer-based wakeup such as - * MsgWaitForMultipleObjectsEx (which is what the mainloop is based on) is based - * on the TGT resolution, so by default it is ~15msec, but can be increased by apps. - * - * The QPC timer has too many issues to be used as is. The only way it could be used - * is to use it to interpolate the lower precision clocks. Firefox does something like - * this: - * https://bugzilla.mozilla.org/show_bug.cgi?id=363258 - * - * However this seems quite complicated, so we're not doing this right now. - * - * The approach we take instead is to use the TGT timer, extending it to 64bit - * either by using the GTC64 value, or if that is not available, a process local - * time epoch that we increment when we detect a timer wrap (assumes that we read - * the time at least once every 50 days). - * - * This means that: - * - We have a globally consistent monotonic clock on Vista and later - * - We have a locally monotonic clock on XP - * - Apps that need higher precision in timeouts and clock reads can call - * timeBeginPeriod() to increase it as much as they want - */ - - if (g_GetTickCount64 != NULL) + if (G_LIKELY (g_monotonic_usec_per_tick != 0)) { - guint32 ticks_as_32bit; - - ticks = g_GetTickCount64 (); - ticks32 = timeGetTime(); - - /* GTC64 and TGT are sampled at different times, however they - * have the same base and source (msecs since system boot). - * They can differ by as much as -16 to +16 msecs. - * We can't just inject the low bits into the 64bit counter - * as one of the counters can have wrapped in 32bit space and - * the other not. Instead we calculate the signed difference - * in 32bit space and apply that difference to the 64bit counter. - */ - ticks_as_32bit = (guint32)ticks; - - /* We could do some 2's complement hack, but we play it safe */ - if (ticks32 - ticks_as_32bit <= G_MAXINT32) - ticks += ticks32 - ticks_as_32bit; - else - ticks -= ticks_as_32bit - ticks32; - } - else - { - guint32 epoch; - - epoch = g_atomic_int_get (&g_win32_tick_epoch); - - /* Must read ticks after the epoch. Then we're guaranteed - * that the ticks value we read is higher or equal to any - * previous ones that lead to the writing of the epoch. - */ - ticks32 = timeGetTime(); - - /* We store the MSB of the current time as the LSB - * of the epoch. Comparing these bits lets us detect when - * the 32bit counter has wrapped so we can increase the - * epoch. - * - * This will work as long as this function is called at - * least once every ~24 days, which is half the wrap time - * of a 32bit msec counter. I think this is pretty likely. - * - * Note that g_win32_tick_epoch is a process local state, - * so the monotonic clock will not be the same between - * processes. - */ - if ((ticks32 >> 31) != (epoch & 1)) - { - epoch++; - g_atomic_int_set (&g_win32_tick_epoch, epoch); - } + LARGE_INTEGER ticks; + if (QueryPerformanceCounter (&ticks)) + return (gint64)(ticks.QuadPart * g_monotonic_usec_per_tick); - ticks = (guint64)ticks32 | ((guint64)epoch) << 31; + g_warning ("QueryPerformanceCounter Failed (%d)", GetLastError ()); + g_monotonic_usec_per_tick = 0; } - return ticks * 1000; + return 0; } #elif defined(HAVE_MACH_MACH_TIME_H) /* Mac OS */ gint64 diff --git a/glib/gmain.h b/glib/gmain.h index 26400d44b..497992789 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -2,17 +2,17 @@ * Copyright (C) 1998-2000 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_MAIN_H__ diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c index bc23a6d20..d180a9a4d 100644 --- a/glib/gmappedfile.c +++ b/glib/gmappedfile.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h index b566b7de4..1a06f7c56 100644 --- a/glib/gmappedfile.h +++ b/glib/gmappedfile.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 46923b836..ed30ed297 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmarkup.h b/glib/gmarkup.h index 05c3cc9fa..96375b55a 100644 --- a/glib/gmarkup.h +++ b/glib/gmarkup.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmem.c b/glib/gmem.c index 05dc0304b..aa981de1c 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmem.h b/glib/gmem.h index 835624bfb..462d49ed3 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gmessages.c b/glib/gmessages.c index eba12559e..cac882f6b 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1586,7 +1586,10 @@ done_query: * Log a message with structured data. The message will be passed through to * the log writer set by the application using g_log_set_writer_func(). If the * message is fatal (i.e. its log level is %G_LOG_LEVEL_ERROR), the program will - * be aborted at the end of this function. + * be aborted at the end of this function. If the log writer returns + * %G_LOG_WRITER_UNHANDLED (failure), no other fallback writers will be tried. + * See the documentation for #GLogWriterFunc for information on chaining + * writers. * * The structured data is provided as key–value pairs, where keys are UTF-8 * strings, and values are arbitrary pointers — typically pointing to UTF-8 diff --git a/glib/gmessages.h b/glib/gmessages.h index c923aea58..ee0dca85c 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -179,6 +179,13 @@ struct _GLogField * but is provided separately for convenience of deciding whether or where to * output the log entry. * + * Writer functions should return %G_LOG_WRITER_HANDLED if they handled the log + * message successfully or if they deliberately ignored it. If there was an + * error handling the message (for example, if the writer function is meant to + * send messages to a remote logging server and there is a network error), it + * should return %G_LOG_WRITER_UNHANDLED. This allows writer functions to be + * chained and fall back to simpler handlers in case of failure. + * * Returns: %G_LOG_WRITER_HANDLED if the log entry was handled successfully; * %G_LOG_WRITER_UNHANDLED otherwise * Since: 2.50 diff --git a/glib/gnode.c b/glib/gnode.c index b529f48dc..51c9fdc80 100644 --- a/glib/gnode.c +++ b/glib/gnode.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gnode.h b/glib/gnode.h index 50ad1bdf3..b7220a44c 100644 --- a/glib/gnode.h +++ b/glib/gnode.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/goption.c b/glib/goption.c index 7a21d1ccc..78698ccb9 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -4,17 +4,17 @@ * Copyright (C) 2004 Anders Carlsson <andersca@gnome.org> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ /** diff --git a/glib/goption.h b/glib/goption.h index 93b80e3ff..83d4f77fd 100644 --- a/glib/goption.h +++ b/glib/goption.h @@ -3,17 +3,17 @@ * Copyright (C) 2004 Anders Carlsson <andersca@gnome.org> * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_OPTION_H__ diff --git a/glib/gpattern.c b/glib/gpattern.c index 16e70b833..a43d86668 100644 --- a/glib/gpattern.c +++ b/glib/gpattern.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gpattern.h b/glib/gpattern.h index 4263a8f47..bd9e4a7af 100644 --- a/glib/gpattern.h +++ b/glib/gpattern.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gpoll.c b/glib/gpoll.c index ffc959d21..265cb9210 100644 --- a/glib/gpoll.c +++ b/glib/gpoll.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gpoll.h b/glib/gpoll.h index 95fe01ce1..2cbd69729 100644 --- a/glib/gpoll.h +++ b/glib/gpoll.h @@ -2,17 +2,17 @@ * Copyright (C) 2008 Red Hat, Inc. * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef __G_POLL_H__ diff --git a/glib/gprimes.c b/glib/gprimes.c index caa641873..943a23d8d 100644 --- a/glib/gprimes.c +++ b/glib/gprimes.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gprimes.h b/glib/gprimes.h index 2b2281498..0b6ea850d 100644 --- a/glib/gprimes.h +++ b/glib/gprimes.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gprintf.c b/glib/gprintf.c index 71b33225f..2d41f2b89 100644 --- a/glib/gprintf.c +++ b/glib/gprintf.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gprintf.h b/glib/gprintf.h index 212c3377f..429de7a24 100644 --- a/glib/gprintf.h +++ b/glib/gprintf.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gprintfint.h b/glib/gprintfint.h index 88c6170eb..6bf5fdad5 100644 --- a/glib/gprintfint.h +++ b/glib/gprintfint.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gqsort.c b/glib/gqsort.c index 27347bffe..90e65aefe 100644 --- a/glib/gqsort.c +++ b/glib/gqsort.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gqsort.h b/glib/gqsort.h index 904b50617..2ecd75fae 100644 --- a/glib/gqsort.h +++ b/glib/gqsort.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gquark.c b/glib/gquark.c index f2b32019c..7845621fa 100644 --- a/glib/gquark.c +++ b/glib/gquark.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gquark.h b/glib/gquark.h index 87fb713d2..1822c4bf7 100644 --- a/glib/gquark.h +++ b/glib/gquark.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gqueue.c b/glib/gqueue.c index 317661420..01bd13439 100644 --- a/glib/gqueue.c +++ b/glib/gqueue.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gqueue.h b/glib/gqueue.h index 28c6a5ee3..f81f5fb4e 100644 --- a/glib/gqueue.h +++ b/glib/gqueue.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/grand.c b/glib/grand.c index 0cb833e9a..610fc69c6 100644 --- a/glib/grand.c +++ b/glib/grand.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/grand.h b/glib/grand.h index 9011404a4..82528c77b 100644 --- a/glib/grand.h +++ b/glib/grand.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gscanner.c b/glib/gscanner.c index 52b770a61..ebcd6e9dd 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gscanner.h b/glib/gscanner.h index 704c2cbb8..db0d9aaf9 100644 --- a/glib/gscanner.h +++ b/glib/gscanner.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gsequence.c b/glib/gsequence.c index b813ee88a..f11fb1ed9 100644 --- a/glib/gsequence.c +++ b/glib/gsequence.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gsequence.h b/glib/gsequence.h index 879bb0447..6dce2f4fb 100644 --- a/glib/gsequence.h +++ b/glib/gsequence.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gshell.c b/glib/gshell.c index 1248ae533..f955d93a2 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gshell.h b/glib/gshell.h index d3d85c90b..798dd7808 100644 --- a/glib/gshell.h +++ b/glib/gshell.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gslice.c b/glib/gslice.c index 9022062ac..b97b4e026 100644 --- a/glib/gslice.c +++ b/glib/gslice.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gslice.h b/glib/gslice.h index e50980959..80762761f 100644 --- a/glib/gslice.h +++ b/glib/gslice.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gslist.c b/glib/gslist.c index 0757f6408..d85b42597 100644 --- a/glib/gslist.c +++ b/glib/gslist.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gslist.h b/glib/gslist.h index 9d6e50a36..2704ef7d3 100644 --- a/glib/gslist.h +++ b/glib/gslist.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c index 6614b0a39..360f47ebb 100644 --- a/glib/gspawn-win32-helper.c +++ b/glib/gspawn-win32-helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 35e96125f..2dfb4e889 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gspawn.c b/glib/gspawn.c index 5395d9b92..b621f592a 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gspawn.h b/glib/gspawn.h index 9f96102de..6489f4a87 100644 --- a/glib/gspawn.h +++ b/glib/gspawn.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstdio.c b/glib/gstdio.c index 831ae98e0..1c2587022 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstdio.h b/glib/gstdio.h index 3a0ee37bd..15091b3e7 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index a9f575428..fcf4927a4 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h index 35ec4aca7..d09de568c 100644 --- a/glib/gstrfuncs.h +++ b/glib/gstrfuncs.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstring.c b/glib/gstring.c index 9ba7b0ac5..966502019 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstring.h b/glib/gstring.h index c8d5b8a5f..77951b041 100644 --- a/glib/gstring.h +++ b/glib/gstring.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstringchunk.c b/glib/gstringchunk.c index 16c98f0ed..6b7e7b470 100644 --- a/glib/gstringchunk.c +++ b/glib/gstringchunk.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h index dde236314..8d445e349 100644 --- a/glib/gstringchunk.h +++ b/glib/gstringchunk.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtester-report b/glib/gtester-report index b91028429..4f201435e 100755 --- a/glib/gtester-report +++ b/glib/gtester-report @@ -6,7 +6,7 @@ # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtester.c b/glib/gtester.c index cff1cf921..7a38907a1 100644 --- a/glib/gtester.c +++ b/glib/gtester.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtestutils.c b/glib/gtestutils.c index e06256d6e..70947e0a6 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 99e237dc0..2a9cd22ca 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7ba2..aa0e36e3a 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c index e917face1..938ed5f3c 100644 --- a/glib/gthread-win32.c +++ b/glib/gthread-win32.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthread.c b/glib/gthread.c index fdb367398..5debfa6ae 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthread.h b/glib/gthread.h index 7d20cdb4a..3d765c2c2 100644 --- a/glib/gthread.h +++ b/glib/gthread.h @@ -1,10 +1,10 @@ /* GLIB - Library of useful routines for C programming * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c index 725f62733..dd7289370 100644 --- a/glib/gthreadpool.c +++ b/glib/gthreadpool.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h index 95c10a0fd..11c3d1d16 100644 --- a/glib/gthreadpool.h +++ b/glib/gthreadpool.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h index ae4c33d0a..2cf8bdc00 100644 --- a/glib/gthreadprivate.h +++ b/glib/gthreadprivate.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtimer.c b/glib/gtimer.c index 38262ff9e..de0ef1b93 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtimer.h b/glib/gtimer.h index b897f1fcf..5699b6964 100644 --- a/glib/gtimer.h +++ b/glib/gtimer.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtimezone.c b/glib/gtimezone.c index 89aa83e41..192ff13a0 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtimezone.h b/glib/gtimezone.h index 3e6f1cbf6..dc29bd76e 100644 --- a/glib/gtimezone.h +++ b/glib/gtimezone.h @@ -1,10 +1,10 @@ /* * Copyright © 2010 Codethink Limited * - * This library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * licence, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtranslit.c b/glib/gtranslit.c index b1e0dff14..600638c86 100644 --- a/glib/gtranslit.c +++ b/glib/gtranslit.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtrashstack.c b/glib/gtrashstack.c index 3a0d0bf16..02599d632 100644 --- a/glib/gtrashstack.c +++ b/glib/gtrashstack.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtrashstack.h b/glib/gtrashstack.h index c1150d517..44b3c6c10 100644 --- a/glib/gtrashstack.h +++ b/glib/gtrashstack.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtree.c b/glib/gtree.c index 6978d06ed..324cdafa0 100644 --- a/glib/gtree.c +++ b/glib/gtree.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtree.h b/glib/gtree.h index 56a329240..ceb148d6b 100644 --- a/glib/gtree.h +++ b/glib/gtree.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gtypes.h b/glib/gtypes.h index 18ac6d17b..0a5a27604 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gunibreak.c b/glib/gunibreak.c index ad17a5d5e..334acd3d4 100644 --- a/glib/gunibreak.c +++ b/glib/gunibreak.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gunicode.h b/glib/gunicode.h index e7cc04e6d..ff4392ecc 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gunicodeprivate.h b/glib/gunicodeprivate.h index dde5ee5a9..6334960f3 100644 --- a/glib/gunicodeprivate.h +++ b/glib/gunicodeprivate.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 5ba676242..161a2de82 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index d109eae05..b85351883 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/guniprop.c b/glib/guniprop.c index 3726c7ab3..4ce947426 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gurifuncs.c b/glib/gurifuncs.c index 1978de10f..a613c04b6 100644 --- a/glib/gurifuncs.c +++ b/glib/gurifuncs.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h index e36ac0deb..e59a43c87 100644 --- a/glib/gurifuncs.h +++ b/glib/gurifuncs.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gutf8.c b/glib/gutf8.c index 6b74e1f15..e66e06160 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gutils.c b/glib/gutils.c index 9f7b7e3cf..70b08b6e1 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1003,9 +1003,11 @@ static gchar *g_prgname = NULL; * Gets the name of the program. This name should not be localized, * in contrast to g_get_application_name(). * - * If you are using GDK or GTK+ the program name is set in gdk_init(), - * which is called by gtk_init(). The program name is found by taking - * the last component of @argv[0]. + * If you are using #GApplication the program name is set in + * g_application_run(). In case of GDK or GTK+ it is set in + * gdk_init(), which is called by gtk_init() and the + * #GtkApplication::startup handler. The program name is found by + * taking the last component of @argv[0]. * * Returns: the name of the program. The returned string belongs * to GLib and must not be modified or freed. @@ -1052,6 +1054,12 @@ g_get_prgname (void) * Sets the name of the program. This name should not be localized, * in contrast to g_set_application_name(). * + * If you are using #GApplication the program name is set in + * g_application_run(). In case of GDK or GTK+ it is set in + * gdk_init(), which is called by gtk_init() and the + * #GtkApplication::startup handler. The program name is found by + * taking the last component of @argv[0]. + * * Note that for thread-safety reasons this function can only be called once. */ void diff --git a/glib/gutils.h b/glib/gutils.h index f84fbcb0b..356c64370 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c index 8301250dd..bdf09696f 100644 --- a/glib/gvariant-core.c +++ b/glib/gvariant-core.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-core.h b/glib/gvariant-core.h index 034dd433b..fc19b7ec4 100644 --- a/glib/gvariant-core.h +++ b/glib/gvariant-core.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-internal.h b/glib/gvariant-internal.h index 6bf19ad02..600be1c1a 100644 --- a/glib/gvariant-internal.h +++ b/glib/gvariant-internal.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c index 3741acb6f..e4ba19270 100644 --- a/glib/gvariant-parser.c +++ b/glib/gvariant-parser.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c index 5643cc18e..69f183121 100644 --- a/glib/gvariant-serialiser.c +++ b/glib/gvariant-serialiser.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant-serialiser.h b/glib/gvariant-serialiser.h index 2be3299cf..c49708662 100644 --- a/glib/gvariant-serialiser.h +++ b/glib/gvariant-serialiser.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvariant.c b/glib/gvariant.c index 579f569ed..e117d0740 100644 --- a/glib/gvariant.c +++ b/glib/gvariant.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -3296,7 +3296,7 @@ g_variant_builder_ref (GVariantBuilder *builder) * #GVariantBuilder if you want to abort building the value part-way * through. This function need not be called if you call * g_variant_builder_end() and it also doesn't need to be called on - * builders allocated with g_variant_builder_new (see + * builders allocated with g_variant_builder_new() (see * g_variant_builder_unref() for that). * * This function leaves the #GVariantBuilder structure set to all-zeros. diff --git a/glib/gvariant.h b/glib/gvariant.h index 5ffd8fcda..3e1392620 100644 --- a/glib/gvariant.h +++ b/glib/gvariant.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c index e36c1c169..9910dee93 100644 --- a/glib/gvarianttype.c +++ b/glib/gvarianttype.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h index 1f1532c3a..6bb5e07b5 100644 --- a/glib/gvarianttype.h +++ b/glib/gvarianttype.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c index e10a304b1..9dade7064 100644 --- a/glib/gvarianttypeinfo.c +++ b/glib/gvarianttypeinfo.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h index 0714d78c7..cc60f36e2 100644 --- a/glib/gvarianttypeinfo.h +++ b/glib/gvarianttypeinfo.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gversion.c b/glib/gversion.c index 0a2feed11..02acb7d8e 100644 --- a/glib/gversion.c +++ b/glib/gversion.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gversion.h b/glib/gversion.h index ab341aae0..68343f727 100644 --- a/glib/gversion.h +++ b/glib/gversion.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h index 48a6ece87..c23c40247 100644 --- a/glib/gversionmacros.h +++ b/glib/gversionmacros.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gwakeup.c b/glib/gwakeup.c index c0f1ba054..563efc7c8 100644 --- a/glib/gwakeup.c +++ b/glib/gwakeup.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gwakeup.h b/glib/gwakeup.h index adf415c9d..64db2bf86 100644 --- a/glib/gwakeup.h +++ b/glib/gwakeup.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gwin32.c b/glib/gwin32.c index 2fa6f2621..f54d65f2b 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/gwin32.h b/glib/gwin32.h index 9905fafff..7dc8d9365 100644 --- a/glib/gwin32.h +++ b/glib/gwin32.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/1bit-mutex.c b/glib/tests/1bit-mutex.c index fb29ec1e8..9a5252ca4 100644 --- a/glib/tests/1bit-mutex.c +++ b/glib/tests/1bit-mutex.c @@ -2,10 +2,10 @@ * Copyright © 2008 Ryan Lortie * Copyright © 2010 Codethink Limited * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/642026.c b/glib/tests/642026.c index 140d459a2..51eb2cac1 100644 --- a/glib/tests/642026.c +++ b/glib/tests/642026.c @@ -2,10 +2,10 @@ * Author: Simon McVittie <simon.mcvittie@collabora.co.uk> * Copyright © 2011 Nokia Corporation * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/Makefile.in b/glib/tests/Makefile.in index d937c4cef..8bc29244a 100644 --- a/glib/tests/Makefile.in +++ b/glib/tests/Makefile.in @@ -1134,7 +1134,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ G_TEST_BUILDDIR="$(abs_builddir)" \ G_DEBUG=gc-friendly \ diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c index 01c597d86..f696f0f18 100644 --- a/glib/tests/array-test.c +++ b/glib/tests/array-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/atomic.c b/glib/tests/atomic.c index 1c252c6a0..35fa705a4 100644 --- a/glib/tests/atomic.c +++ b/glib/tests/atomic.c @@ -1,10 +1,10 @@ /* * Copyright 2011 Red Hat, Inc. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/bytes.c b/glib/tests/bytes.c index 58f3bedea..518824312 100644 --- a/glib/tests/bytes.c +++ b/glib/tests/bytes.c @@ -1,10 +1,10 @@ /* * Copyright 2011 Collabora Ltd. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/cache.c b/glib/tests/cache.c index ec34df9b6..f68761674 100644 --- a/glib/tests/cache.c +++ b/glib/tests/cache.c @@ -3,7 +3,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/convert.c b/glib/tests/convert.c index a712ff34c..5855a340d 100644 --- a/glib/tests/convert.c +++ b/glib/tests/convert.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c index dc738e0e1..fdaed1acc 100644 --- a/glib/tests/gvariant.c +++ b/glib/tests/gvariant.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/glib/tests/hash.c b/glib/tests/hash.c index a3ccc89bb..160ba4f56 100644 --- a/glib/tests/hash.c +++ b/glib/tests/hash.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/hostutils.c b/glib/tests/hostutils.c index 275bb3031..be17d65c8 100644 --- a/glib/tests/hostutils.c +++ b/glib/tests/hostutils.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/markup-collect.c b/glib/tests/markup-collect.c index b9890b7e5..dd9b1b4bd 100644 --- a/glib/tests/markup-collect.c +++ b/glib/tests/markup-collect.c @@ -1,10 +1,10 @@ /* * Copyright © 2007 Ryan Lortie * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/markup-subparser.c b/glib/tests/markup-subparser.c index 13362664a..d1ceffb00 100644 --- a/glib/tests/markup-subparser.c +++ b/glib/tests/markup-subparser.c @@ -1,10 +1,10 @@ /* * Copyright © 2008 Ryan Lortie * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/glib/tests/markups/valid-14.expected b/glib/tests/markups/valid-14.expected index 452595c61..d4b70ec78 100644 --- a/glib/tests/markups/valid-14.expected +++ b/glib/tests/markups/valid-14.expected @@ -10,7 +10,7 @@ ELEMENT 'foo' * * GLib is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the + * published by the Free Software Foundation; either version 2.1 of the * License, or (at your option) any later version. * * GLib is distributed in the hope that it will be useful, diff --git a/glib/tests/markups/valid-14.gmarkup b/glib/tests/markups/valid-14.gmarkup index 28c47a8bb..7aee1c586 100644 --- a/glib/tests/markups/valid-14.gmarkup +++ b/glib/tests/markups/valid-14.gmarkup @@ -7,7 +7,7 @@ * * GLib is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the + * published by the Free Software Foundation; either version 2.1 of the * License, or (at your option) any later version. * * GLib is distributed in the hope that it will be useful, diff --git a/glib/tests/node.c b/glib/tests/node.c index e3b515f81..db42e8c7b 100644 --- a/glib/tests/node.c +++ b/glib/tests/node.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/overflow.c b/glib/tests/overflow.c index 5c68d9550..9e277641c 100644 --- a/glib/tests/overflow.c +++ b/glib/tests/overflow.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. * diff --git a/glib/tests/pattern.c b/glib/tests/pattern.c index 538c4d221..f3fc21f45 100644 --- a/glib/tests/pattern.c +++ b/glib/tests/pattern.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/regex.c b/glib/tests/regex.c index a59721425..56bd2d5eb 100644 --- a/glib/tests/regex.c +++ b/glib/tests/regex.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/scannerapi.c b/glib/tests/scannerapi.c index 0505e47d1..a8c6879d3 100644 --- a/glib/tests/scannerapi.c +++ b/glib/tests/scannerapi.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/shell.c b/glib/tests/shell.c index c8b2bcc5e..c3cab105a 100644 --- a/glib/tests/shell.c +++ b/glib/tests/shell.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/sort.c b/glib/tests/sort.c index bb3067744..7aa27c895 100644 --- a/glib/tests/sort.c +++ b/glib/tests/sort.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/tree.c b/glib/tests/tree.c index a8da67df0..a00e9ab77 100644 --- a/glib/tests/tree.c +++ b/glib/tests/tree.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/uri.c b/glib/tests/uri.c index 83a2f10e6..d292f33bf 100644 --- a/glib/tests/uri.c +++ b/glib/tests/uri.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/utf8-performance.c b/glib/tests/utf8-performance.c index 5049b99e9..a9d06ea66 100644 --- a/glib/tests/utf8-performance.c +++ b/glib/tests/utf8-performance.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/utf8-pointer.c b/glib/tests/utf8-pointer.c index 6fa4b4c0e..df1f442d0 100644 --- a/glib/tests/utf8-pointer.c +++ b/glib/tests/utf8-pointer.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/glib/tests/utf8-validate.c b/glib/tests/utf8-validate.c index 8c97b402e..122aa761d 100644 --- a/glib/tests/utf8-validate.c +++ b/glib/tests/utf8-validate.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/COPYING b/gmodule/COPYING index bf50f20de..4362b4915 100644 --- a/gmodule/COPYING +++ b/gmodule/COPYING @@ -1,112 +1,125 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs @@ -133,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -255,7 +268,7 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - 6. As an exception to the Sections above, you may also compile or + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit @@ -282,23 +295,31 @@ of these things: Library will not necessarily be able to recompile the application to use the modified definitions.) - b) Accompany the work with a written offer, valid for at + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. - c) If distribution of the work is made by offering access to copy + d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. - d) Verify that the user has already received a copy of these + e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. @@ -347,7 +368,7 @@ Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to +You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent @@ -390,7 +411,7 @@ excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. +versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. @@ -411,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries @@ -453,19 +474,18 @@ convey the exclusion of warranty; and each file should have at least the Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff --git a/gmodule/gmodule-ar.c b/gmodule/gmodule-ar.c index 64e430765..3301c474f 100644 --- a/gmodule/gmodule-ar.c +++ b/gmodule/gmodule-ar.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c index 80ef80ceb..42363aac5 100644 --- a/gmodule/gmodule-dl.c +++ b/gmodule/gmodule-dl.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule-dyld.c b/gmodule/gmodule-dyld.c index 20bf8a3f6..764ac83e6 100644 --- a/gmodule/gmodule-dyld.c +++ b/gmodule/gmodule-dyld.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c index 2a35b1920..4f707b525 100644 --- a/gmodule/gmodule-win32.c +++ b/gmodule/gmodule-win32.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index 5676eca20..c55fc762e 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 81bf6b0ad..8982f5952 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmodule.rc b/gmodule/gmodule.rc index 844421086..05df72d84 100644 --- a/gmodule/gmodule.rc +++ b/gmodule/gmodule.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,2,0 - PRODUCTVERSION 2,53,2,0 + FILEVERSION 2,53,3,0 + PRODUCTVERSION 2,53,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GModule" - VALUE "FileVersion", "2.53.2.0" + VALUE "FileVersion", "2.53.3.0" VALUE "InternalName", "libgmodule-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik and others." VALUE "OriginalFilename", "libgmodule-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.2" + VALUE "ProductVersion", "2.53.3" END END BLOCK "VarFileInfo" diff --git a/gmodule/gmoduleconf.h.in b/gmodule/gmoduleconf.h.in index eea067941..2dad04749 100644 --- a/gmodule/gmoduleconf.h.in +++ b/gmodule/gmoduleconf.h.in @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32 index 88633b5e2..478365382 100644 --- a/gmodule/gmoduleconf.h.win32 +++ b/gmodule/gmoduleconf.h.win32 @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gatomicarray.c b/gobject/gatomicarray.c index 08af80dca..57b9ec228 100644 --- a/gobject/gatomicarray.c +++ b/gobject/gatomicarray.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gatomicarray.h b/gobject/gatomicarray.h index b0363b868..9550fa396 100644 --- a/gobject/gatomicarray.h +++ b/gobject/gatomicarray.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gbinding.c b/gobject/gbinding.c index d477ffd85..f92fad826 100644 --- a/gobject/gbinding.c +++ b/gobject/gbinding.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gbinding.h b/gobject/gbinding.h index 069c0d0b6..b4eb233b3 100644 --- a/gobject/gbinding.h +++ b/gobject/gbinding.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gboxed.c b/gobject/gboxed.c index 17719f2de..97aa07587 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gboxed.h b/gobject/gboxed.h index d169d03c6..bcaf0b01a 100644 --- a/gobject/gboxed.h +++ b/gobject/gboxed.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gclosure.c b/gobject/gclosure.c index cced5f90b..27de53f8d 100644 --- a/gobject/gclosure.c +++ b/gobject/gclosure.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gclosure.h b/gobject/gclosure.h index 04ebeaf79..393348c7c 100644 --- a/gobject/gclosure.h +++ b/gobject/gclosure.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/genums.c b/gobject/genums.c index 469f79806..8212dd99d 100644 --- a/gobject/genums.c +++ b/gobject/genums.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/genums.h b/gobject/genums.h index 109d79809..c66ce45c0 100644 --- a/gobject/genums.h +++ b/gobject/genums.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index 2ad225e62..3bc4a0f90 100644 --- a/gobject/glib-genmarshal.c +++ b/gobject/glib-genmarshal.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/glib-types.h b/gobject/glib-types.h index 36d7e6efd..78a199d1d 100644 --- a/gobject/glib-types.h +++ b/gobject/glib-types.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h index 980203f17..57654e419 100644 --- a/gobject/gobject-autocleanups.h +++ b/gobject/gobject-autocleanups.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the licence, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobject-query.c b/gobject/gobject-query.c index b5dff42a4..2992567dd 100644 --- a/gobject/gobject-query.c +++ b/gobject/gobject-query.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobject.c b/gobject/gobject.c index 55655a6d0..b59cf8b1b 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobject.h b/gobject/gobject.h index afb45436e..b97dfb278 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobject.rc b/gobject/gobject.rc index c005b1af0..ec826e81d 100644 --- a/gobject/gobject.rc +++ b/gobject/gobject.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,2,0 - PRODUCTVERSION 2,53,2,0 + FILEVERSION 2,53,3,0 + PRODUCTVERSION 2,53,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GObject" - VALUE "FileVersion", "2.53.2.0" + VALUE "FileVersion", "2.53.3.0" VALUE "InternalName", "libgobject-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik, Red Hat, Inc. and others" VALUE "OriginalFilename", "libgobject-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.2" + VALUE "ProductVersion", "2.53.3" END END BLOCK "VarFileInfo" diff --git a/gobject/gobject_trace.h b/gobject/gobject_trace.h index ec0b66691..30ef2fb5b 100644 --- a/gobject/gobject_trace.h +++ b/gobject/gobject_trace.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c index db2aa4696..1a7d23f26 100644 --- a/gobject/gobjectnotifyqueue.c +++ b/gobject/gobjectnotifyqueue.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gparam.c b/gobject/gparam.c index f50793ae5..b7f71f5d2 100644 --- a/gobject/gparam.c +++ b/gobject/gparam.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gparam.h b/gobject/gparam.h index c847d4e4a..535b98035 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c index 9685ef446..8c285fa1c 100644 --- a/gobject/gparamspecs.c +++ b/gobject/gparamspecs.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h index 7b6dd2a0f..e2bb62130 100644 --- a/gobject/gparamspecs.h +++ b/gobject/gparamspecs.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gsignal.c b/gobject/gsignal.c index 5ef29cdce..82ca20182 100644 --- a/gobject/gsignal.c +++ b/gobject/gsignal.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gsignal.h b/gobject/gsignal.h index 42d4904a2..97f847944 100644 --- a/gobject/gsignal.h +++ b/gobject/gsignal.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gsourceclosure.c b/gobject/gsourceclosure.c index 910b6b2e3..8ee0266c5 100644 --- a/gobject/gsourceclosure.c +++ b/gobject/gsourceclosure.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h index ba2391d69..484767703 100644 --- a/gobject/gsourceclosure.h +++ b/gobject/gsourceclosure.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gtype-private.h b/gobject/gtype-private.h index ad5623871..5f2f13b47 100644 --- a/gobject/gtype-private.h +++ b/gobject/gtype-private.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -90,6 +90,17 @@ void _g_closure_invoke_va (GClosure *closure, int n_params, GType *param_types); +/** + * _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE: + * + * See also G_DEFINE_TYPE_EXTENDED(). This macro is generally only + * necessary as a workaround for classes which have properties of + * object types that may be initialized in distinct threads. See: + * https://bugzilla.gnome.org/show_bug.cgi?id=674885 + * + * Currently private. + */ +#define _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE(TN, t_n, T_P, _f_, _P_, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE (TN, t_n, T_P) {_P_;} _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER (TN, t_n, T_P, _f_){_C_;} _G_DEFINE_TYPE_EXTENDED_END() G_END_DECLS diff --git a/gobject/gtype.c b/gobject/gtype.c index f381a7876..b0f12f6c3 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gtype.h b/gobject/gtype.h index d010a31a8..89c1bec16 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1943,7 +1943,8 @@ static void type_name##_class_intern_init (gpointer klass) \ } #endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */ -#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ +/* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */ +#define _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \ \ static void type_name##_init (TypeName *self); \ static void type_name##_class_init (TypeName##Class *klass); \ @@ -1962,7 +1963,11 @@ type_name##_get_instance_private (TypeName *self) \ GType \ type_name##_get_type (void) \ { \ - static volatile gsize g_define_type_id__volatile = 0; \ + static volatile gsize g_define_type_id__volatile = 0; + /* Prelude goes here */ + +/* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */ +#define _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \ if (g_once_init_enter (&g_define_type_id__volatile)) \ { \ GType g_define_type_id = \ @@ -1982,6 +1987,13 @@ type_name##_get_type (void) \ return g_define_type_id__volatile; \ } /* closes type_name##_get_type() */ +/* This was defined before we had G_DEFINE_TYPE_WITH_CODE_AND_PRELUDE, it's simplest + * to keep it. + */ +#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \ + _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \ + #define _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PREREQ) \ \ static void type_name##_default_init (TypeName##Interface *klass); \ diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c index 35d13e214..5289ffeb4 100644 --- a/gobject/gtypemodule.c +++ b/gobject/gtypemodule.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h index 27be251f4..d989e82f6 100644 --- a/gobject/gtypemodule.h +++ b/gobject/gtypemodule.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gtypeplugin.c b/gobject/gtypeplugin.c index bb4d01d75..9068b053e 100644 --- a/gobject/gtypeplugin.c +++ b/gobject/gtypeplugin.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h index d56eb6691..482f55cae 100644 --- a/gobject/gtypeplugin.h +++ b/gobject/gtypeplugin.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvalue.c b/gobject/gvalue.c index f82c80ed7..8c02e930a 100644 --- a/gobject/gvalue.c +++ b/gobject/gvalue.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvalue.h b/gobject/gvalue.h index fd924f67c..e4760f4b8 100644 --- a/gobject/gvalue.h +++ b/gobject/gvalue.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c index dccc85237..76d946846 100644 --- a/gobject/gvaluearray.c +++ b/gobject/gvaluearray.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h index a52fe2c1e..d8b6bb55c 100644 --- a/gobject/gvaluearray.h +++ b/gobject/gvaluearray.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index e66839440..f58858841 100644 --- a/gobject/gvaluecollector.h +++ b/gobject/gvaluecollector.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluetransform.c b/gobject/gvaluetransform.c index 48051f871..a346a54f1 100644 --- a/gobject/gvaluetransform.c +++ b/gobject/gvaluetransform.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c index d71797551..0afa8bdb8 100644 --- a/gobject/gvaluetypes.c +++ b/gobject/gvaluetypes.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h index 5319acb61..927443532 100644 --- a/gobject/gvaluetypes.h +++ b/gobject/gvaluetypes.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/tests/Makefile.in b/gobject/tests/Makefile.in index 1ea429594..a5bc5b716 100644 --- a/gobject/tests/Makefile.in +++ b/gobject/tests/Makefile.in @@ -778,7 +778,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ G_TEST_SRCDIR="$(abs_srcdir)" \ G_TEST_BUILDDIR="$(abs_builddir)" \ G_DEBUG=gc-friendly \ diff --git a/gobject/tests/ifaceproperties.c b/gobject/tests/ifaceproperties.c index 0528ac8f0..569f42dfe 100644 --- a/gobject/tests/ifaceproperties.c +++ b/gobject/tests/ifaceproperties.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gobject/tests/qdata.c b/gobject/tests/qdata.c index abafc4dd8..528bdc68e 100644 --- a/gobject/tests/qdata.c +++ b/gobject/tests/qdata.c @@ -1,10 +1,10 @@ /* * Copyright 2012 Red Hat, Inc. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * * See the included COPYING file for more information. */ diff --git a/gobject/tests/testcommon.h b/gobject/tests/testcommon.h index a69f594c3..157fe65cc 100644 --- a/gobject/tests/testcommon.h +++ b/gobject/tests/testcommon.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c index 22080da22..266dd84a3 100644 --- a/gthread/gthread-impl.c +++ b/gthread/gthread-impl.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gthread/gthread.rc b/gthread/gthread.rc index 2ea3e2e17..501d33cd5 100644 --- a/gthread/gthread.rc +++ b/gthread/gthread.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,2,0 - PRODUCTVERSION 2,53,2,0 + FILEVERSION 2,53,3,0 + PRODUCTVERSION 2,53,3,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GThread" - VALUE "FileVersion", "2.53.2.0" + VALUE "FileVersion", "2.53.3.0" VALUE "InternalName", "libgthread-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2011 Peter Mattis, Spencer Kimball, Josh MacDonald, Sebastian Wilhelmi and others." VALUE "OriginalFilename", "libgthread-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.2" + VALUE "ProductVersion", "2.53.3" END END BLOCK "VarFileInfo" Binary files differ@@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-05-12 09:06+0000\n" -"PO-Revision-Date: 2017-05-12 17:22+0200\n" +"POT-Creation-Date: 2017-06-02 16:12+0000\n" +"PO-Revision-Date: 2017-06-09 21:34+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: Deutsch <gnome-de@gnome.org>\n" "Language: de\n" @@ -26,21 +26,21 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.1\n" +"X-Generator: Poedit 2.0.2\n" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "GApplication options" msgstr "Optionen für GApplication" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "Show GApplication options" msgstr "Optionen für GApplication anzeigen" -#: ../gio/gapplication.c:538 +#: ../gio/gapplication.c:535 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "GApplication Dienstmodus starten (aus D-Bus Dienstdateien verwenden)" -#: ../gio/gapplication.c:550 +#: ../gio/gapplication.c:547 msgid "Override the application’s ID" msgstr "Anwendungskennung überschreiben" @@ -291,7 +291,7 @@ msgid "Truncate not supported on base stream" msgstr "Abschneiden wird vom Basis-Datenstrom nicht unterstützt" #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 -#: ../gio/gdbusprivate.c:1379 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 #: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" @@ -534,7 +534,7 @@ msgstr "" "Bus-Adresse konnte nicht über die Umgebungsvariable DBUS_STARTER_BUS_TYPE " "ermittelt werden – unbekannter Wert »%s«" -#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7157 +#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7155 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -694,12 +694,12 @@ msgstr "" "wurde erhalten" #: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 -#: ../gio/gdbusconnection.c:6588 +#: ../gio/gdbusconnection.c:6586 #, c-format msgid "No such interface '%s'" msgstr "Keine derartige Schnittstelle »%s«" -#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7097 +#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" msgstr "Keine derartige Schnittstelle »%s« des Objekts im Pfad %s" @@ -734,17 +734,17 @@ msgstr "Eigenschaft kann nicht gesetzt werden: %s.%s" msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "Methode »%s« gab Typ »%s« zurück, aber »%s« wurde erwartet" -#: ../gio/gdbusconnection.c:6699 +#: ../gio/gdbusconnection.c:6697 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "Methode »%s« in Schnittstelle »%s« mit Signatur »%s« existiert nicht" -#: ../gio/gdbusconnection.c:6820 +#: ../gio/gdbusconnection.c:6818 #, c-format msgid "A subtree is already exported for %s" msgstr "Ein Unterbaum wurde bereits für %s exportiert" -#: ../gio/gdbusconnection.c:7148 +#: ../gio/gdbusconnection.c:7146 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -952,12 +952,12 @@ msgstr "Fehlerrückmeldung mit Inhalt des Typs »%s«" msgid "Error return with empty body" msgstr "Fehlerrückmeldung mit leerem Inhalt" -#: ../gio/gdbusprivate.c:2043 +#: ../gio/gdbusprivate.c:2066 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "Hardware-Profil konnte nicht ermittelt werden: %s" -#: ../gio/gdbusprivate.c:2088 +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "" "/var/lib/dbus/machine-id oder /etc/machine-id konnte nicht geladen werden: " @@ -1261,7 +1261,6 @@ msgstr "" "abgebrochen wird (Sekunden); 0 für keine Zeitspanne (Voreinstellung)" #: ../gio/gdbus-tool.c:2031 -#| msgid "[OPTION…]" msgid "[OPTION…] BUS-NAME" msgstr "[OPTION …] BUS-NAME" @@ -1291,41 +1290,41 @@ msgstr "Fehler: Zu viele Argumente.\n" msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Fehler: %s ist kein gültiger, bekannter Bus-Name\n" -#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 +#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533 msgid "Unnamed" msgstr "Unbenannt" -#: ../gio/gdesktopappinfo.c:2407 +#: ../gio/gdesktopappinfo.c:2411 msgid "Desktop file didn’t specify Exec field" msgstr "Desktop-Datei hat kein Exec-Feld angegeben" -#: ../gio/gdesktopappinfo.c:2692 +#: ../gio/gdesktopappinfo.c:2696 msgid "Unable to find terminal required for application" msgstr "Für die Anwendung benötigtes Terminal konnte nicht gefunden werden" -#: ../gio/gdesktopappinfo.c:3100 +#: ../gio/gdesktopappinfo.c:3129 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "Konfigurationsordner %s für Benutzeranwendungen konnte nicht erstellt " "werden: %s" -#: ../gio/gdesktopappinfo.c:3104 +#: ../gio/gdesktopappinfo.c:3133 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" "MIME-Konfigurationsordner %s des Benutzers konnte nicht erstellt werden: %s" -#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 +#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397 msgid "Application information lacks an identifier" msgstr "Den Anwendungsinformationen fehlt ein Bezeichner" -#: ../gio/gdesktopappinfo.c:3602 +#: ../gio/gdesktopappinfo.c:3631 #, c-format msgid "Can’t create user desktop file %s" msgstr "Benutzer-Desktop-Datei %s kann nicht erstellt werden" -#: ../gio/gdesktopappinfo.c:3736 +#: ../gio/gdesktopappinfo.c:3765 #, c-format msgid "Custom definition for %s" msgstr "Benutzerdefinition für %s" @@ -3124,15 +3123,15 @@ msgstr "Quelldatenstrom ist bereits geschlossen" msgid "Error resolving “%sâ€: %s" msgstr "Fehler beim Auflösen von »%s«: %s" -#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 -#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 -#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 +#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874 +#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143 +#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format msgid "The resource at “%s†does not exist" msgstr "Die Ressource auf »%s« existiert nicht" -#: ../gio/gresource.c:760 +#: ../gio/gresource.c:771 #, c-format msgid "The resource at “%s†failed to decompress" msgstr "Die Ressource auf »%s« konnte nicht entpackt werden" @@ -3842,15 +3841,17 @@ msgstr "" "Dies ist die letzte Möglichkeit, das Passwort korrekt einzugeben, bevor Ihr " "Zugang gesperrt wird." -#: ../gio/gtlspassword.c:113 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" -"Ein Passwort wurde mehrfach inkorrekt eingegeben, daher wird Ihr Zugriff " -"nach weiteren Fehleingaben gesperrt." +"Passwörter wurden mehrfach inkorrekt eingegeben, daher wird Ihr Zugriff nach " +"weiteren Fehleingaben gesperrt." -#: ../gio/gtlspassword.c:115 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "Das eingegebene Passwort ist ungültig." @@ -5,262 +5,577 @@ # Joop EGGEN < <, 2006. # Brian CROOM < >, 2008. # Manuel < >, 2010. -# Ryan Lortie <desrt@desrt.ca>, 2011. -# Tiffany Antopolski <tiffany.antopolski@gmail.com>, 2011, 2012. -# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011, 2012. -# +# Ryan LORTIE <desrt@desrt.ca>, 2011. +# Tiffany ANTOPOLSKI <tiffany.antopolski@gmail.com>, 2011, 2012. +# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011, 2012, 2017. msgid "" msgstr "" "Project-Id-Version: glib 2.3.0\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-09 21:19+0000\n" -"PO-Revision-Date: 2012-03-11 12:01+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=glib&k" +"eywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2017-05-29 10:24+0000\n" +"PO-Revision-Date: 2017-06-11 02:06+0200\n" "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n" -"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n" +"Language-Team: Esperanto <gnome-eo-list@gnome.org>\n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.7.1\n" -"X-Launchpad-Export-Date: 2011-05-15 07:40+0000\n" "X-Project-Style: gnome\n" -#: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492 -#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317 -#: ../gio/ginputstream.c:556 ../gio/ginputstream.c:680 -#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:753 +#: ../gio/gapplication.c:490 +#| msgid "Application Options:" +msgid "GApplication options" +msgstr "Aplikaĵaj opcioj" + +#: ../gio/gapplication.c:490 +#| msgid "Application Options:" +msgid "Show GApplication options" +msgstr "Montri aplikaĵajn opciojn" + +#: ../gio/gapplication.c:535 +msgid "Enter GApplication service mode (use from D-Bus service files)" +msgstr "" + +#: ../gio/gapplication.c:547 +msgid "Override the application’s ID" +msgstr "" + +#: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 +#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488 +#: ../gio/gsettings-tool.c:520 +msgid "Print help" +msgstr "Presi helpon" + +#: ../gio/gapplication-tool.c:47 ../gio/gresource-tool.c:489 +#: ../gio/gresource-tool.c:557 +msgid "[COMMAND]" +msgstr "[KOMANDO]" + +#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228 +#, fuzzy +#| msgid "Print help" +msgid "Print version" +msgstr "Montri helpon" + +#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:526 +msgid "Print version information and exit" +msgstr "" + +#: ../gio/gapplication-tool.c:52 +#, fuzzy +#| msgid "Can't find application" +msgid "List applications" +msgstr "Ne eblas trovi aplikaĵon" + +#: ../gio/gapplication-tool.c:53 +msgid "List the installed D-Bus activatable applications (by .desktop files)" +msgstr "" + +#: ../gio/gapplication-tool.c:55 +#, fuzzy +#| msgid "Can't find application" +msgid "Launch an application" +msgstr "Ne eblas trovi aplikaĵon" + +#: ../gio/gapplication-tool.c:56 +msgid "Launch the application (with optional files to open)" +msgstr "" + +#: ../gio/gapplication-tool.c:57 +msgid "APPID [FILE…]" +msgstr "" + +#: ../gio/gapplication-tool.c:59 +msgid "Activate an action" +msgstr "" + +#: ../gio/gapplication-tool.c:60 +msgid "Invoke an action on the application" +msgstr "" + +#: ../gio/gapplication-tool.c:61 +msgid "APPID ACTION [PARAMETER]" +msgstr "" + +#: ../gio/gapplication-tool.c:63 +msgid "List available actions" +msgstr "" + +#: ../gio/gapplication-tool.c:64 +msgid "List static actions for an application (from .desktop file)" +msgstr "" + +#: ../gio/gapplication-tool.c:65 ../gio/gapplication-tool.c:71 +msgid "APPID" +msgstr "" + +#: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133 +#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224 +msgid "COMMAND" +msgstr "KOMANDO" + +#: ../gio/gapplication-tool.c:70 +msgid "The command to print detailed help for" +msgstr "" + +#: ../gio/gapplication-tool.c:71 +msgid "Application identifier in D-Bus format (eg: org.example.viewer)" +msgstr "" + +#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665 +#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698 +#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561 +msgid "FILE" +msgstr "DOSIERO" + +#: ../gio/gapplication-tool.c:72 +msgid "Optional relative or absolute filenames, or URIs to open" +msgstr "" + +#: ../gio/gapplication-tool.c:73 +#| msgid "SECTION" +msgid "ACTION" +msgstr "AGO" + +#: ../gio/gapplication-tool.c:73 +#, fuzzy +#| msgid "Destination name to introspect" +msgid "The action name to invoke" +msgstr "Nomo de celo por introspekti" + +#: ../gio/gapplication-tool.c:74 +msgid "PARAMETER" +msgstr "" + +#: ../gio/gapplication-tool.c:74 +msgid "Optional parameter to the action invocation, in GVariant format" +msgstr "" + +#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526 +#: ../gio/gsettings-tool.c:612 +#, c-format +msgid "" +"Unknown command %s\n" +"\n" +msgstr "" +"Nekonata komando %s\n" +"\n" + +#: ../gio/gapplication-tool.c:101 +#| msgid "Usage:" +msgid "Usage:\n" +msgstr "Uzo:\n" + +#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551 +#: ../gio/gsettings-tool.c:647 +msgid "Arguments:\n" +msgstr "Argumentoj:\n" + +#: ../gio/gapplication-tool.c:133 +msgid "[ARGS…]" +msgstr "" + +#: ../gio/gapplication-tool.c:134 +#, c-format +msgid "Commands:\n" +msgstr "" + +#. Translators: do not translate 'help', but please translate 'COMMAND'. +#: ../gio/gapplication-tool.c:146 +#, c-format +msgid "" +"Use “%s help COMMAND†to get detailed help.\n" +"\n" +msgstr "" + +#: ../gio/gapplication-tool.c:165 +#, c-format +msgid "" +"%s command requires an application id to directly follow\n" +"\n" +msgstr "" + +#: ../gio/gapplication-tool.c:171 +#, c-format +msgid "invalid application id: “%sâ€\n" +msgstr "" + +#. Translators: %s is replaced with a command name like 'list-actions' +#: ../gio/gapplication-tool.c:182 +#, c-format +msgid "" +"“%s†takes no arguments\n" +"\n" +msgstr "" + +#: ../gio/gapplication-tool.c:266 +#, c-format +#| msgid "Could not connect to %s: " +msgid "unable to connect to D-Bus: %s\n" +msgstr "ne eblas konekti al D-Bus: %s\n" + +#: ../gio/gapplication-tool.c:286 +#, c-format +#| msgid "Error sending message: %s" +msgid "error sending %s message to application: %s\n" +msgstr "eraro dum sendado de %s mesaÄo al aplikaĵo: %s\n" + +#: ../gio/gapplication-tool.c:317 +#, c-format +msgid "action name must be given after application id\n" +msgstr "" + +#: ../gio/gapplication-tool.c:325 +#, c-format +msgid "" +"invalid action name: “%sâ€\n" +"action names must consist of only alphanumerics, “-†and “.â€\n" +msgstr "" + +#: ../gio/gapplication-tool.c:344 +#, fuzzy, c-format +#| msgid "Error parsing parameter %d: %s\n" +msgid "error parsing action parameter: %s\n" +msgstr "eraro dum sintaksa analizo de la parametro: %s\n" + +#: ../gio/gapplication-tool.c:356 +#, c-format +msgid "actions accept a maximum of one parameter\n" +msgstr "" + +#: ../gio/gapplication-tool.c:411 +#, c-format +msgid "list-actions command takes only the application id" +msgstr "" + +#: ../gio/gapplication-tool.c:421 +#, fuzzy, c-format +#| msgid "Unable to find terminal required for application" +msgid "unable to find desktop file for application %s\n" +msgstr "ne eblas trovi terminalon bezonata por aplikaĵo %s\n" + +#: ../gio/gapplication-tool.c:466 +#, c-format +#| msgid "" +#| "Unknown command %s\n" +#| "\n" +msgid "" +"unrecognised command: %s\n" +"\n" +msgstr "" +"nekonata komando: %s\n" +"\n" + +#: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498 +#: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379 +#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019 +#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834 +#: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:206 #, c-format msgid "Too large count value passed to %s" msgstr "Tro granda nombra valoro transdonita al %s" -#: ../gio/gbufferedinputstream.c:882 ../gio/ginputstream.c:888 -#: ../gio/giostream.c:292 ../gio/goutputstream.c:1228 +#: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575 +#: ../gio/gdataoutputstream.c:562 +#, fuzzy +#| msgid "Seek not supported on stream" +msgid "Seek not supported on base stream" +msgstr "Serĉo ne estas subtenata en fluo" + +#: ../gio/gbufferedinputstream.c:937 +#, fuzzy +#| msgid "Cannot truncate GMemoryInputStream" +msgid "Cannot truncate GBufferedInputStream" +msgstr "Ne eblas trunki GMemoryInputStream-on" + +#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208 +#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660 msgid "Stream is already closed" msgstr "Fluo estas jam fermita" -#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1834 -#: ../gio/gdbusconnection.c:1925 ../gio/gdbusconnection.c:2099 -#: ../gio/gdbusprivate.c:1413 ../gio/glocalfile.c:2133 -#: ../gio/gsimpleasyncresult.c:810 ../gio/gsimpleasyncresult.c:836 +#: ../gio/gbufferedoutputstream.c:612 ../gio/gdataoutputstream.c:592 +#, fuzzy +#| msgid "Truncate not supported on stream" +msgid "Truncate not supported on base stream" +msgstr "Trunki ne permesita en fluo" + +#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" msgstr "Operacio rezignita" -#: ../gio/gcharsetconverter.c:263 +#: ../gio/gcharsetconverter.c:260 msgid "Invalid object, not initialized" msgstr "Nevalida objekto, ne pravalorizita" -#: ../gio/gcharsetconverter.c:284 ../gio/gcharsetconverter.c:312 +#: ../gio/gcharsetconverter.c:281 ../gio/gcharsetconverter.c:309 msgid "Incomplete multibyte sequence in input" msgstr "Nekompleta plurbajta sekvenco en enigo" -#: ../gio/gcharsetconverter.c:318 ../gio/gcharsetconverter.c:327 +#: ../gio/gcharsetconverter.c:315 ../gio/gcharsetconverter.c:324 msgid "Not enough space in destination" msgstr "Ne sufiĉa spaco en la cel-loko" -#: ../gio/gcharsetconverter.c:345 ../gio/gdatainputstream.c:854 -#: ../gio/gdatainputstream.c:1294 ../glib/gconvert.c:768 -#: ../glib/gconvert.c:1160 ../glib/giochannel.c:1583 ../glib/giochannel.c:1625 -#: ../glib/giochannel.c:2468 ../glib/gutf8.c:841 ../glib/gutf8.c:1292 +#: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848 +#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845 +#: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598 +#: ../glib/giochannel.c:2442 ../glib/gutf8.c:856 ../glib/gutf8.c:1309 msgid "Invalid byte sequence in conversion input" msgstr "Nevalida bajtosekvenco en konverta enigo" -#: ../gio/gcharsetconverter.c:350 ../glib/gconvert.c:776 -#: ../glib/gconvert.c:1085 ../glib/giochannel.c:1590 ../glib/giochannel.c:2480 +#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770 +#: ../glib/giochannel.c:1563 ../glib/giochannel.c:2454 #, c-format msgid "Error during conversion: %s" msgstr "Eraro dum la konverto: %s" -#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:954 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 msgid "Cancellable initialization not supported" msgstr "Rezignebla pravalorizo ne estas subtenata" -#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:568 -#: ../glib/gconvert.c:646 ../glib/giochannel.c:1411 -#, c-format -msgid "Conversion from character set '%s' to '%s' is not supported" +#: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 +#: ../glib/giochannel.c:1384 +#, fuzzy, c-format +#| msgid "Conversion from character set '%s' to '%s' is not supported" +msgid "Conversion from character set “%s†to “%s†is not supported" msgstr "Konverto de signaro '%s' al '%s' ne estas subtenata" -#: ../gio/gcharsetconverter.c:462 ../glib/gconvert.c:572 -#: ../glib/gconvert.c:650 -#, c-format -msgid "Could not open converter from '%s' to '%s'" +#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325 +#, fuzzy, c-format +#| msgid "Could not open converter from '%s' to '%s'" +msgid "Could not open converter from “%s†to “%sâ€" msgstr "Ne eblas malfermi konvertilon de '%s' al '%s'" -#: ../gio/gcontenttype.c:180 +#: ../gio/gcontenttype.c:358 +#, c-format +msgid "%s type" +msgstr "%s tipo" + +#: ../gio/gcontenttype-win32.c:177 msgid "Unknown type" msgstr "Nekonata tipo" -#: ../gio/gcontenttype.c:181 +#: ../gio/gcontenttype-win32.c:179 #, c-format msgid "%s filetype" msgstr "%s dosierotipo" -#: ../gio/gcontenttype.c:680 -#, c-format -msgid "%s type" -msgstr "%s tipo" - -#: ../gio/gcredentials.c:273 ../gio/gcredentials.c:495 +#: ../gio/gcredentials.c:312 ../gio/gcredentials.c:571 msgid "GCredentials is not implemented on this OS" msgstr "GCredentials ne estas realigita sur ĉi tiu operaciumo" -#: ../gio/gcredentials.c:447 +#: ../gio/gcredentials.c:467 msgid "There is no GCredentials support for your platform" msgstr "Estas neniu subteno por GCredentials por via platformo" -#: ../gio/gdatainputstream.c:311 +#: ../gio/gcredentials.c:513 +#, fuzzy +#| msgid "GCredentials is not implemented on this OS" +msgid "GCredentials does not contain a process ID on this OS" +msgstr "GCredentials ne estas realigita sur ĉi tiu operaciumo" + +#: ../gio/gcredentials.c:565 +#, fuzzy +#| msgid "GCredentials is not implemented on this OS" +msgid "Credentials spoofing is not possible on this OS" +msgstr "Credentials ne estas realigita sur ĉi tiu operaciumo" + +#: ../gio/gdatainputstream.c:304 msgid "Unexpected early end-of-stream" msgstr "Neatendata frua flufino" -#: ../gio/gdbusaddress.c:142 ../gio/gdbusaddress.c:230 -#: ../gio/gdbusaddress.c:311 -#, c-format -msgid "Unsupported key '%s' in address entry '%s'" +#: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243 +#: ../gio/gdbusaddress.c:324 +#, fuzzy, c-format +#| msgid "Unsupported key '%s' in address entry '%s'" +msgid "Unsupported key “%s†in address entry “%sâ€" msgstr "Nesubtenata Ålosilo '%s' en adresenigo '%s'" -#: ../gio/gdbusaddress.c:169 -#, c-format +#: ../gio/gdbusaddress.c:182 +#, fuzzy, c-format +#| msgid "" +#| "Address '%s' is invalid (need exactly one of path, tmpdir or abstract " +#| "keys)" msgid "" -"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)" +"Address “%s†is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -"Adreso '%s' estas malvalida (bezonas precize unu el 'path', 'tmpdir' aÅ " -"'abstract' Ålosiloj) " +"Adreso “%s†estas malvalida (bezonas precize unu el 'path', 'tmpdir' aÅ " +"'abstract' Ålosiloj)" -#: ../gio/gdbusaddress.c:182 -#, c-format -msgid "Meaningless key/value pair combination in address entry '%s'" +#: ../gio/gdbusaddress.c:195 +#, fuzzy, c-format +#| msgid "Meaningless key/value pair combination in address entry '%s'" +msgid "Meaningless key/value pair combination in address entry “%sâ€" msgstr "Sensignifa Ålosilo/valoro parokombinaĵo en adresa enigo '%s'" -#: ../gio/gdbusaddress.c:245 ../gio/gdbusaddress.c:326 -#, c-format -msgid "Error in address '%s' - the port attribute is malformed" +#: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339 +#, fuzzy, c-format +#| msgid "Error in address '%s' - the port attribute is malformed" +msgid "Error in address “%s†— the port attribute is malformed" msgstr "Eraro en adreso '%s' - la 'port' atributo estas misformita" -#: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 -#, c-format -msgid "Error in address '%s' - the family attribute is malformed" +#: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350 +#, fuzzy, c-format +#| msgid "Error in address '%s' - the family attribute is malformed" +msgid "Error in address “%s†— the family attribute is malformed" msgstr "Eraro en adreso '%s' - la 'family' atributo estas misformita" -#: ../gio/gdbusaddress.c:446 -#, c-format -msgid "Address element '%s', does not contain a colon (:)" +#: ../gio/gdbusaddress.c:460 +#, fuzzy, c-format +#| msgid "Address element '%s', does not contain a colon (:)" +msgid "Address element “%s†does not contain a colon (:)" msgstr "Adresa elemento '%s', ne havas dupunkton (:)" -#: ../gio/gdbusaddress.c:467 -#, c-format +#: ../gio/gdbusaddress.c:481 +#, fuzzy, c-format +#| msgid "" +#| "Key/Value pair %d, '%s', in address element '%s', does not contain an " +#| "equal sign" msgid "" -"Key/Value pair %d, '%s', in address element '%s', does not contain an equal " +"Key/Value pair %d, “%sâ€, in address element “%s†does not contain an equal " "sign" msgstr "" "Åœlosilo/valoro paro %d, '%s', en adresa elemento '%s', ne havas egalsignon" -#: ../gio/gdbusaddress.c:481 -#, c-format +#: ../gio/gdbusaddress.c:495 +#, fuzzy, c-format +#| msgid "" +#| "Error unescaping key or value in Key/Value pair %d, '%s', in address " +#| "element '%s'" msgid "" -"Error unescaping key or value in Key/Value pair %d, '%s', in address element " -"'%s'" +"Error unescaping key or value in Key/Value pair %d, “%sâ€, in address element " +"“%sâ€" msgstr "" -"Eraro dum malkodÅanÄo de la Ålosilo aÅ la valoro en Ålosilo/valoro paro %d, '" -"%s', en adresa elemento '%s'" +"Eraro dum malkodÅanÄo de la Ålosilo aÅ la valoro en Ålosilo/valoro paro %d, " +"'%s', en adresa elemento '%s'" -#: ../gio/gdbusaddress.c:559 -#, c-format +#: ../gio/gdbusaddress.c:573 +#, fuzzy, c-format +#| msgid "" +#| "Error in address '%s' - the unix transport requires exactly one of the " +#| "keys 'path' or 'abstract' to be set" msgid "" -"Error in address '%s' - the unix transport requires exactly one of the keys " -"'path' or 'abstract' to be set" +"Error in address “%s†— the unix transport requires exactly one of the keys " +"“path†or “abstract†to be set" msgstr "" "Eraro en adreso '%s' - la uniksa transporto bezonas precize unu de la " "Ålosiloj 'path' aÅ 'abstract' esti agordita" -#: ../gio/gdbusaddress.c:595 -#, c-format -msgid "Error in address '%s' - the host attribute is missing or malformed" +#: ../gio/gdbusaddress.c:609 +#, fuzzy, c-format +#| msgid "Error in address '%s' - the host attribute is missing or malformed" +msgid "Error in address “%s†— the host attribute is missing or malformed" msgstr "Eraro en adreso '%s' - la 'host' atributo mankas aÅ estas misformita" -#: ../gio/gdbusaddress.c:609 -#, c-format -msgid "Error in address '%s' - the port attribute is missing or malformed" +#: ../gio/gdbusaddress.c:623 +#, fuzzy, c-format +#| msgid "Error in address '%s' - the port attribute is missing or malformed" +msgid "Error in address “%s†— the port attribute is missing or malformed" msgstr "" "Eraro en adreso '%s' - la 'port' atributo estas maka aÅ estas misformita" -#: ../gio/gdbusaddress.c:623 -#, c-format -msgid "Error in address '%s' - the noncefile attribute is missing or malformed" +#: ../gio/gdbusaddress.c:637 +#, fuzzy, c-format +#| msgid "" +#| "Error in address '%s' - the noncefile attribute is missing or malformed" +msgid "Error in address “%s†— the noncefile attribute is missing or malformed" msgstr "" "Eraro en adreso '%s' - la 'noncefile' atributo mankas aÅ estas misformita" -#: ../gio/gdbusaddress.c:644 +#: ../gio/gdbusaddress.c:658 msgid "Error auto-launching: " -msgstr "Eraro dum aÅtolanĉo:" +msgstr "Eraro dum aÅtolanĉo: " -#: ../gio/gdbusaddress.c:652 -#, c-format -msgid "Unknown or unsupported transport '%s' for address '%s'" +#: ../gio/gdbusaddress.c:666 +#, fuzzy, c-format +#| msgid "Unknown or unsupported transport '%s' for address '%s'" +msgid "Unknown or unsupported transport “%s†for address “%sâ€" msgstr "Nekonata aÅ nesubtenata transporto '%s' por adreso '%s'" -#: ../gio/gdbusaddress.c:688 -#, c-format -msgid "Error opening nonce file '%s': %s" +#: ../gio/gdbusaddress.c:702 +#, fuzzy, c-format +#| msgid "Error opening nonce file '%s': %s" +msgid "Error opening nonce file “%sâ€: %s" msgstr "Eraro dum malfermo de dosiero 'nonce' '%s': %s" -#: ../gio/gdbusaddress.c:706 -#, c-format -msgid "Error reading from nonce file '%s': %s" -msgstr "Eraro dum legado de dosiero 'nonce' '%s':%s" +#: ../gio/gdbusaddress.c:720 +#, fuzzy, c-format +#| msgid "Error reading from nonce file '%s': %s" +msgid "Error reading from nonce file “%sâ€: %s" +msgstr "Eraro dum legado de dosiero 'nonce' “%sâ€: %s" -#: ../gio/gdbusaddress.c:715 -#, c-format -msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +#: ../gio/gdbusaddress.c:729 +#, fuzzy, c-format +#| msgid "Error reading from nonce file '%s', expected 16 bytes, got %d" +msgid "Error reading from nonce file “%sâ€, expected 16 bytes, got %d" msgstr "Eraro dum legado de dosiero nonce '%s', 16 baitoj atendita, akirita %d" -#: ../gio/gdbusaddress.c:733 -#, c-format -msgid "Error writing contents of nonce file '%s' to stream:" +#: ../gio/gdbusaddress.c:747 +#, fuzzy, c-format +#| msgid "Error writing contents of nonce file '%s' to stream:" +msgid "Error writing contents of nonce file “%s†to stream:" msgstr "Eraro dum skribado de enhavo de dosiero nonce '%s' al la fluo:" -#: ../gio/gdbusaddress.c:951 +#: ../gio/gdbusaddress.c:956 msgid "The given address is empty" msgstr "La donita adreso estas malplena" -#: ../gio/gdbusaddress.c:1020 +#: ../gio/gdbusaddress.c:1069 +#, fuzzy, c-format +#| msgid "Cannot spawn a message bus without a machine-id: " +msgid "Cannot spawn a message bus when setuid" +msgstr "Ne eblas starti mesaÄan buson sen maÅino-identigo" + +#: ../gio/gdbusaddress.c:1076 msgid "Cannot spawn a message bus without a machine-id: " -msgstr "Ne eblas starti mesaÄan buson sen maÅino-identigo:" +msgstr "Ne eblas starti mesaÄan buson sen maÅino-identigo: " -#: ../gio/gdbusaddress.c:1057 +#: ../gio/gdbusaddress.c:1083 #, c-format -msgid "Error spawning command line '%s': " -msgstr "Eraro dum starto de la komanda linio '%s':" +msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" +msgstr "" + +#: ../gio/gdbusaddress.c:1125 +#, fuzzy, c-format +#| msgid "Error spawning command line '%s': " +msgid "Error spawning command line “%sâ€: " +msgstr "Eraro dum starto de la komanda linio “%sâ€: " -#: ../gio/gdbusaddress.c:1068 +#: ../gio/gdbusaddress.c:1342 #, c-format -msgid "Abnormal program termination spawning command line '%s': %s" -msgstr "Nenormala programfiniÄo dum starto de komanda linio '%s': %s" +msgid "(Type any character to close this window)\n" +msgstr "" -#: ../gio/gdbusaddress.c:1082 +#: ../gio/gdbusaddress.c:1496 #, c-format -msgid "Command line '%s' exited with non-zero exit status %d: %s" -msgstr "Komanda linio '%s' elirinta kun nenula elira kodo %d: %s" +msgid "Session dbus not running, and autolaunch failed" +msgstr "" -#: ../gio/gdbusaddress.c:1155 +#: ../gio/gdbusaddress.c:1507 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" "Ne eblas determini seancobusan adreson (ne estas realigita por ĉi tiu " "operaciumo)" -#: ../gio/gdbusaddress.c:1254 ../gio/gdbusconnection.c:6688 -#, c-format +#: ../gio/gdbusaddress.c:1645 +#, fuzzy, c-format +#| msgid "" +#| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment " +#| "variable - unknown value '%s'" msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " -"- unknown value '%s'" +"— unknown value “%sâ€" msgstr "" "Ne eblas determi busadreson per DBUS_STARTER_BUS_TYPE medivariablo - " "nekonata valoron '%s'" -#: ../gio/gdbusaddress.c:1263 ../gio/gdbusconnection.c:6697 +#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7155 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -268,110 +583,129 @@ msgstr "" "Ne eblas determi busadreso ĉar la DBUS_STARTER_BUS_TYPE medivariable ne " "estas agordita" -#: ../gio/gdbusaddress.c:1273 +#: ../gio/gdbusaddress.c:1664 #, c-format msgid "Unknown bus type %d" msgstr "Nekonata bustipo %d" -#: ../gio/gdbusauth.c:287 +#: ../gio/gdbusauth.c:293 msgid "Unexpected lack of content trying to read a line" msgstr "Neatendita manko de enhavo kiam provas legi linion" -#: ../gio/gdbusauth.c:331 +#: ../gio/gdbusauth.c:337 msgid "Unexpected lack of content trying to (safely) read a line" msgstr "Neatendita manko de enhavo kiam provas legi (sekure) linion" -#: ../gio/gdbusauth.c:502 +#: ../gio/gdbusauth.c:508 #, c-format msgid "" "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "" "Eluzis ĉiujn haveblajn aÅtentigajn metodojn (provinta: %s) (havebla: %s)" -#: ../gio/gdbusauth.c:1158 +#: ../gio/gdbusauth.c:1174 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "Resignita per GDBusAuthObserver::authorize-authenticated-peer" -#: ../gio/gdbusauthmechanismsha1.c:266 -#, c-format -msgid "Error when getting information for directory '%s': %s" +#: ../gio/gdbusauthmechanismsha1.c:261 +#, fuzzy, c-format +#| msgid "Error when getting information for directory '%s': %s" +msgid "Error when getting information for directory “%sâ€: %s" msgstr "Eraro dum akiro de informo de dosierujo '%s': %s" -#: ../gio/gdbusauthmechanismsha1.c:278 -#, c-format +#: ../gio/gdbusauthmechanismsha1.c:273 +#, fuzzy, c-format +#| msgid "" +#| "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" msgid "" -"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o" +"Permissions on directory “%s†are malformed. Expected mode 0700, got 0%o" msgstr "" "Permesoj sur dosierujo '%s' estas misformitaj. Atendita reÄimo 0700, akirita " "0%o" -#: ../gio/gdbusauthmechanismsha1.c:299 -#, c-format -msgid "Error creating directory '%s': %s" +#: ../gio/gdbusauthmechanismsha1.c:294 +#, fuzzy, c-format +#| msgid "Error creating directory '%s': %s" +msgid "Error creating directory “%sâ€: %s" msgstr "Eraro dum kreo de la dosierujo '%s': %s" -#: ../gio/gdbusauthmechanismsha1.c:382 -#, c-format -msgid "Error opening keyring '%s' for reading: " -msgstr "Eraro dum malfermo de la Ålosiloringo '%s' por legi:" +#: ../gio/gdbusauthmechanismsha1.c:377 +#, fuzzy, c-format +#| msgid "Error opening keyring '%s' for reading: " +msgid "Error opening keyring “%s†for reading: " +msgstr "Eraro dum malfermo de la Ålosiloringo “%s†por legi: " -#: ../gio/gdbusauthmechanismsha1.c:406 ../gio/gdbusauthmechanismsha1.c:718 -#, c-format -msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +#: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714 +#, fuzzy, c-format +#| msgid "Line %d of the keyring at '%s' with content '%s' is malformed" +msgid "Line %d of the keyring at “%s†with content “%s†is malformed" msgstr "Linio %d de la Ålosiloringo al '%s' kun enhavo '%s' estas misformita" -#: ../gio/gdbusauthmechanismsha1.c:420 ../gio/gdbusauthmechanismsha1.c:732 -#, c-format +#: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728 +#, fuzzy, c-format +#| msgid "" +#| "First token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"First token of line %d of the keyring at '%s' with content '%s' is malformed" +"First token of line %d of the keyring at “%s†with content “%s†is malformed" msgstr "" "Unua ĵetono de linio %d de la Ålosiloringo al '%s' kun enhavo '%s' estas " "misformita" -#: ../gio/gdbusauthmechanismsha1.c:435 ../gio/gdbusauthmechanismsha1.c:746 -#, c-format +#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742 +#, fuzzy, c-format +#| msgid "" +#| "Second token of line %d of the keyring at '%s' with content '%s' is " +#| "malformed" msgid "" -"Second token of line %d of the keyring at '%s' with content '%s' is malformed" +"Second token of line %d of the keyring at “%s†with content “%s†is malformed" msgstr "" "Dua ĵetono de linio %d de la Ålosiloringo al '%s' kun enhavo '%s' estas " "misformita" -#: ../gio/gdbusauthmechanismsha1.c:459 -#, c-format -msgid "Didn't find cookie with id %d in the keyring at '%s'" +#: ../gio/gdbusauthmechanismsha1.c:454 +#, fuzzy, c-format +#| msgid "Didn't find cookie with id %d in the keyring at '%s'" +msgid "Didn’t find cookie with id %d in the keyring at “%sâ€" msgstr "Ne trovas kuketon kun identigo %d en la Ålosiloringo ĉe '%s'" -#: ../gio/gdbusauthmechanismsha1.c:536 -#, c-format -msgid "Error deleting stale lock file '%s': %s" +#: ../gio/gdbusauthmechanismsha1.c:532 +#, fuzzy, c-format +#| msgid "Error deleting stale lock file '%s': %s" +msgid "Error deleting stale lock file “%sâ€: %s" msgstr "Eraro dum forigo de la malnova Ålosdosiero '%s': %s" -#: ../gio/gdbusauthmechanismsha1.c:568 +#: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -msgid "Error creating lock file '%s': %s" -msgstr "Eraro dum kreo de la Ålosdosiero '%s':%s" +#| msgid "Error creating lock file '%s': %s" +msgid "Error creating lock file “%sâ€: %s" +msgstr "Eraro dum kreo de la Ålosdosiero “%sâ€: %s" -#: ../gio/gdbusauthmechanismsha1.c:598 -#, c-format -msgid "Error closing (unlinked) lock file '%s': %s" +#: ../gio/gdbusauthmechanismsha1.c:594 +#, fuzzy, c-format +#| msgid "Error closing (unlinked) lock file '%s': %s" +msgid "Error closing (unlinked) lock file “%sâ€: %s" msgstr "Eraro dum fermo de la (malligita) Ålosdosiero '%s': %s" -#: ../gio/gdbusauthmechanismsha1.c:608 +#: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -msgid "Error unlinking lock file '%s': %s" -msgstr "Eraro dum malligado de la Ålosdosiero '%s':%s" +#| msgid "Error unlinking lock file '%s': %s" +msgid "Error unlinking lock file “%sâ€: %s" +msgstr "Eraro dum malligado de la Ålosdosiero “%sâ€: %s" -#: ../gio/gdbusauthmechanismsha1.c:685 -#, c-format -msgid "Error opening keyring '%s' for writing: " +#: ../gio/gdbusauthmechanismsha1.c:681 +#, fuzzy, c-format +#| msgid "Error opening keyring '%s' for writing: " +msgid "Error opening keyring “%s†for writing: " msgstr "Eraro dum malfermo de Ålosiringo '%s' por skribi: " -#: ../gio/gdbusauthmechanismsha1.c:882 -#, c-format -msgid "(Additionally, releasing the lock for '%s' also failed: %s) " -msgstr "(Cetere, liberigo de la seruro por '%s' ankaÅ ne sukcesis: %s)" +#: ../gio/gdbusauthmechanismsha1.c:878 +#, fuzzy, c-format +#| msgid "(Additionally, releasing the lock for '%s' also failed: %s) " +msgid "(Additionally, releasing the lock for “%s†also failed: %s) " +msgstr "(Cetere, liberigo de la seruro por “%s†ankaÅ ne sukcesis: %s) " -#: ../gio/gdbusconnection.c:594 ../gio/gdbusconnection.c:2402 +#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378 msgid "The connection is closed" msgstr "La konekto estas fermita" @@ -379,112 +713,130 @@ msgstr "La konekto estas fermita" msgid "Timeout was reached" msgstr "Tempolimo estis atingita" -#: ../gio/gdbusconnection.c:2524 +#: ../gio/gdbusconnection.c:2500 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "Nesubtenataj flagoj renkontitaj dum kreo de klientflanka konekto" -#: ../gio/gdbusconnection.c:4026 ../gio/gdbusconnection.c:4342 +#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471 #, c-format msgid "" "No such interface 'org.freedesktop.DBus.Properties' on object at path %s" msgstr "" "Neniu tia interfaco 'org.freedesktop.DBus.Properties' en objekto en vojo %s" -#: ../gio/gdbusconnection.c:4097 -#, c-format -msgid "Error setting property '%s': Expected type '%s' but got '%s'" -msgstr "" -"Eraro dum agordado de la atributo '%s': Atendita tipo '%s' sed akiris '%s'" - -#: ../gio/gdbusconnection.c:4192 +#: ../gio/gdbusconnection.c:4266 #, c-format msgid "No such property '%s'" msgstr "Neniu tia atributo '%s'" -#: ../gio/gdbusconnection.c:4204 +#: ../gio/gdbusconnection.c:4278 #, c-format msgid "Property '%s' is not readable" msgstr "Atributo '%s' ne estas legebla" -#: ../gio/gdbusconnection.c:4215 +#: ../gio/gdbusconnection.c:4289 #, c-format msgid "Property '%s' is not writable" msgstr "Atributo '%s' ne estas skribebla" -#: ../gio/gdbusconnection.c:4285 ../gio/gdbusconnection.c:6131 +#: ../gio/gdbusconnection.c:4309 #, c-format -msgid "No such interface '%s'" -msgstr "Neniu tia interfaco '%s' " +msgid "Error setting property '%s': Expected type '%s' but got '%s'" +msgstr "" +"Eraro dum agordado de la atributo '%s': Atendita tipo '%s' sed akiris '%s'" -#: ../gio/gdbusconnection.c:4469 -msgid "No such interface" -msgstr "Neniu tia interfaco" +#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 +#: ../gio/gdbusconnection.c:6586 +#, c-format +msgid "No such interface '%s'" +msgstr "Neniu tia interfaco '%s'" -#: ../gio/gdbusconnection.c:4690 ../gio/gdbusconnection.c:6637 +#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" msgstr "Neniu tia interfaco '%s' sur objekto en vojo %s" -#: ../gio/gdbusconnection.c:4742 +#: ../gio/gdbusconnection.c:4938 #, c-format msgid "No such method '%s'" msgstr "Neniu tia metodo '%s'" -#: ../gio/gdbusconnection.c:4773 +#: ../gio/gdbusconnection.c:4969 #, c-format msgid "Type of message, '%s', does not match expected type '%s'" msgstr "Tipo de mesaÄo, '%s', ne kongruas kun la atendita tipo '%s'" -#: ../gio/gdbusconnection.c:4993 +#: ../gio/gdbusconnection.c:5167 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Objekto jam estas elportita por la interfaco %s ĉe %s" -#: ../gio/gdbusconnection.c:5191 +#: ../gio/gdbusconnection.c:5393 +#, fuzzy, c-format +#| msgid "Unable to create socket: %s" +msgid "Unable to retrieve property %s.%s" +msgstr "Ne eblas krei kontaktskatolon %s.%s" + +#: ../gio/gdbusconnection.c:5449 +#, fuzzy, c-format +#| msgid "Unable to create socket: %s" +msgid "Unable to set property %s.%s" +msgstr "Ne eblas krei kontaktskatolon %s.%s" + +#: ../gio/gdbusconnection.c:5625 #, c-format msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "Metodo '%s' redonis tipo '%s', sed estis atendata '%s' '" -#: ../gio/gdbusconnection.c:6242 +#: ../gio/gdbusconnection.c:6697 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "Metodo '%s' sur interfaco '%s' kun subskribo '%s' ne existas" -#: ../gio/gdbusconnection.c:6361 +#: ../gio/gdbusconnection.c:6818 #, c-format msgid "A subtree is already exported for %s" msgstr "Subarbo estas jam elportita por %s" -#: ../gio/gdbusmessage.c:859 +#: ../gio/gdbusconnection.c:7146 +#, c-format +msgid "" +"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " +"- unknown value '%s'" +msgstr "" +"Ne eblas determi busadreson per DBUS_STARTER_BUS_TYPE medivariablo - " +"nekonata valoron '%s'" + +#: ../gio/gdbusmessage.c:1246 msgid "type is INVALID" msgstr "tipo estas NEVALIDA" -#: ../gio/gdbusmessage.c:870 +#: ../gio/gdbusmessage.c:1257 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "METODO_VOKO mesaÄo: VOJO aÅ MEMBRO kapo-kampo mankas" -#: ../gio/gdbusmessage.c:881 +#: ../gio/gdbusmessage.c:1268 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "METOD_REVENO mesaÄo: RESPONDO_SERI0 kapo-kampo mankas" -#: ../gio/gdbusmessage.c:893 +#: ../gio/gdbusmessage.c:1280 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "ERARMESAÄœO: RESPONDO_SERIO kapo-kampo aÅ ERARO_NOMO mankas" -#: ../gio/gdbusmessage.c:906 +#: ../gio/gdbusmessage.c:1293 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "SIGNALMESAÄœO: VOJO, INTERFACO or MEMBRO kapo-kampo mankas" -#: ../gio/gdbusmessage.c:914 +#: ../gio/gdbusmessage.c:1301 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" msgstr "" -"SIGNALMESAÄœO: La VOJO-a kapo-kampo uzas la valoron reservitan org." -"freedesktop.DBus.Local" +"SIGNALMESAÄœO: La VOJO-a kapo-kampo uzas la valoron reservitan " +"/org/freedesktop/DBus/Local" -#: ../gio/gdbusmessage.c:922 +#: ../gio/gdbusmessage.c:1309 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -492,38 +844,47 @@ msgstr "" "SIGNALMESAÄœO: La kapo-kampo INTERFACO uzas la valoron reservitan org." "freedesktop.DBus.Local" -#: ../gio/gdbusmessage.c:998 +#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417 #, c-format -msgid "Wanted to read %lu byte but got EOF" -msgid_plural "Wanted to read %lu bytes but got EOF" -msgstr[0] "Volis legi %lu bajto sed akiris EOF" -msgstr[1] "Volis legi %lu bajtoj sed akiris EOF" +#| msgid "Wanted to read %lu byte but got EOF" +#| msgid_plural "Wanted to read %lu bytes but got EOF" +msgid "Wanted to read %lu byte but only got %lu" +msgid_plural "Wanted to read %lu bytes but only got %lu" +msgstr[0] "Volis legi %lu bajto sed nur akiris %lu" +msgstr[1] "Volis legi %lu bajtoj sed nur akiris %lu" -#: ../gio/gdbusmessage.c:1025 -#, c-format +#: ../gio/gdbusmessage.c:1371 +#, fuzzy, c-format +#| msgid "Expected NUL byte after the string '%s' but found byte %d" +msgid "Expected NUL byte after the string “%s†but found byte %d" +msgstr "Atendita NUL bajto post la ĉeno '%s' sed trovita bajto %d" + +#: ../gio/gdbusmessage.c:1390 +#, fuzzy, c-format +#| msgid "" +#| "Expected valid UTF-8 string but found invalid bytes at byte offset %d " +#| "(length of string is %d). The valid UTF-8 string up until that point was " +#| "'%s'" msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " -"(length of string is %d). The valid UTF-8 string up until that point was '%s'" +"(length of string is %d). The valid UTF-8 string up until that point was “%sâ€" msgstr "" "Atendis validan UTF-8 ĉenon sed trovitaj nevalidaj bajtoj ĉe bajto deÅovo %d " -"(longeco de ĉeno estas %d). La valida UTF-8 ĉeno Äis tiu punkto estis '%s' " - -#: ../gio/gdbusmessage.c:1038 -#, c-format -msgid "Expected NUL byte after the string '%s' but found byte %d" -msgstr "Atendita NUL bajto post la ĉeno '%s' sed trovita bajto %d" +"(longeco de ĉeno estas %d). La valida UTF-8 ĉeno Äis tiu punkto estis “%sâ€" -#: ../gio/gdbusmessage.c:1242 -#, c-format -msgid "Parsed value '%s' is not a valid D-Bus object path" +#: ../gio/gdbusmessage.c:1589 +#, fuzzy, c-format +#| msgid "Parsed value '%s' is not a valid D-Bus object path" +msgid "Parsed value “%s†is not a valid D-Bus object path" msgstr "Analizita valoro '%s' ne estas valida D-Bus objektovojo" -#: ../gio/gdbusmessage.c:1268 -#, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature" +#: ../gio/gdbusmessage.c:1611 +#, fuzzy, c-format +#| msgid "Parsed value '%s' is not a valid D-Bus signature" +msgid "Parsed value “%s†is not a valid D-Bus signature" msgstr "Analizita valoro '%s' ne estas valida D-Busa subskribo" -#: ../gio/gdbusmessage.c:1324 +#: ../gio/gdbusmessage.c:1658 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -536,45 +897,61 @@ msgstr[1] "" "Renkontis matricon de longeco %u bajtoj. Maksimumo estas 2<<26 bajtoj (64 " "MiB)." -#: ../gio/gdbusmessage.c:1490 +#: ../gio/gdbusmessage.c:1678 #, c-format -msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "" +"Encountered array of type “a%câ€, expected to have a length a multiple of %u " +"bytes, but found to be %u bytes in length" +msgstr "" + +#: ../gio/gdbusmessage.c:1845 +#, fuzzy, c-format +#| msgid "Parsed value '%s' for variant is not a valid D-Bus signature" +msgid "Parsed value “%s†for variant is not a valid D-Bus signature" msgstr "Analizita valoro '%s' por variaĵo ne estas valida D-Busa subskribo" -#: ../gio/gdbusmessage.c:1517 -#, c-format +#: ../gio/gdbusmessage.c:1869 +#, fuzzy, c-format +#| msgid "" +#| "Error deserializing GVariant with type string '%s' from the D-Bus wire " +#| "format" msgid "" -"Error deserializing GVariant with type string '%s' from the D-Bus wire format" +"Error deserializing GVariant with type string “%s†from the D-Bus wire format" msgstr "" "Eraro dum malseriigo de GVariant kun tipo ĉeno '%s' de la D-Buso dratoformo" -#: ../gio/gdbusmessage.c:1705 -#, c-format +#: ../gio/gdbusmessage.c:2053 +#, fuzzy, c-format +#| msgid "" +#| "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found " +#| "value 0x%02x" msgid "" -"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value " +"Invalid endianness value. Expected 0x6c (“lâ€) or 0x42 (“Bâ€) but found value " "0x%02x" msgstr "" "Nevalida pezekstrem('endianness')-valoro. Atendita 0x6c ('l') aÅ 0x42 ('B') " "sed trovas valoron 0x%02x" -#: ../gio/gdbusmessage.c:1719 +#: ../gio/gdbusmessage.c:2066 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "Nevalida ĉefprotokolo versio. Atendita 1 sed trovita %d" -#: ../gio/gdbusmessage.c:1776 -#, c-format -msgid "Signature header with signature '%s' found but message body is empty" +#: ../gio/gdbusmessage.c:2122 +#, fuzzy, c-format +#| msgid "Signature header with signature '%s' found but message body is empty" +msgid "Signature header with signature “%s†found but message body is empty" msgstr "" "Subskriba kapo kun subskribo '%s' estis trovita sed korpo de mesaÄo estas " "malplena" -#: ../gio/gdbusmessage.c:1790 -#, c-format -msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +#: ../gio/gdbusmessage.c:2136 +#, fuzzy, c-format +#| msgid "Parsed value '%s' is not a valid D-Bus signature (for body)" +msgid "Parsed value “%s†is not a valid D-Bus signature (for body)" msgstr "Analizita valoro '%s' ne estas valida D-Bus subskribo (por korpo)" -#: ../gio/gdbusmessage.c:1821 +#: ../gio/gdbusmessage.c:2166 #, c-format msgid "No signature header in message but the message body is %u byte" msgid_plural "No signature header in message but the message body is %u bytes" @@ -583,18 +960,20 @@ msgstr[0] "" msgstr[1] "" "Ne estas subskriba kapo en mesaÄo sed la korpo de mesaÄo estas %u bajtoj" -#: ../gio/gdbusmessage.c:1831 +#: ../gio/gdbusmessage.c:2176 msgid "Cannot deserialize message: " -msgstr "Ne eblas malseriigi mesaÄon:" +msgstr "Ne eblas malseriigi mesaÄon: " -#: ../gio/gdbusmessage.c:2163 -#, c-format +#: ../gio/gdbusmessage.c:2517 +#, fuzzy, c-format +#| msgid "" +#| "Error serializing GVariant with type string '%s' to the D-Bus wire format" msgid "" -"Error serializing GVariant with type string '%s' to the D-Bus wire format" +"Error serializing GVariant with type string “%s†to the D-Bus wire format" msgstr "" "Eraro dum seriigo de GVariant kun tipoĉeno '%s' al la D-Buso dratoformo" -#: ../gio/gdbusmessage.c:2304 +#: ../gio/gdbusmessage.c:2654 #, c-format msgid "" "Message has %d file descriptors but the header field indicates %d file " @@ -602,51 +981,63 @@ msgid "" msgstr "" "MesaÄo havas %d dosiernumerojn sed la kapo-kampo indikas %d dosiernumeroj" -#: ../gio/gdbusmessage.c:2312 +#: ../gio/gdbusmessage.c:2662 msgid "Cannot serialize message: " msgstr "Ne eblas seriigi mesaÄon: " -#: ../gio/gdbusmessage.c:2356 -#, c-format -msgid "Message body has signature '%s' but there is no signature header" +#: ../gio/gdbusmessage.c:2706 +#, fuzzy, c-format +#| msgid "Message body has signature '%s' but there is no signature header" +msgid "Message body has signature “%s†but there is no signature header" msgstr "Korpo de mesaÄo havas subskribon '%s' sed ne estas iu subskribokapo" -#: ../gio/gdbusmessage.c:2366 -#, c-format +#: ../gio/gdbusmessage.c:2716 +#, fuzzy, c-format +#| msgid "" +#| "Message body has type signature '%s' but signature in the header field is " +#| "'%s'" msgid "" -"Message body has type signature '%s' but signature in the header field is '" -"%s'" +"Message body has type signature “%s†but signature in the header field is " +"“%sâ€" msgstr "Korpo de mesaÄo havas tipon '%s' sed tipo en la mesaÄokapo estas '%s'" -#: ../gio/gdbusmessage.c:2382 -#, c-format -msgid "Message body is empty but signature in the header field is '(%s)'" +#: ../gio/gdbusmessage.c:2732 +#, fuzzy, c-format +#| msgid "Message body is empty but signature in the header field is '(%s)'" +msgid "Message body is empty but signature in the header field is “(%s)â€" msgstr "Korpo de mesaÄo estas malplena sed tipo en la masaÄokapo estas '(%s)'" -#: ../gio/gdbusmessage.c:2939 -#, c-format -msgid "Error return with body of type '%s'" +#: ../gio/gdbusmessage.c:3285 +#, fuzzy, c-format +#| msgid "Error return with body of type '%s'" +msgid "Error return with body of type “%sâ€" msgstr "Erara reveno kun korpo de tipo '%s'" -#: ../gio/gdbusmessage.c:2947 +#: ../gio/gdbusmessage.c:3293 msgid "Error return with empty body" msgstr "Erara reveno kun malplena korpo" -#: ../gio/gdbusprivate.c:2065 +#: ../gio/gdbusprivate.c:2066 +#, fuzzy, c-format +#| msgid "Unable to trash file: %s" +msgid "Unable to get Hardware profile: %s" +msgstr "Ne eblas forÅovi dosieron %s al rubujo" + +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "Ne eblas Åargi na /var/lib/dbus/machine-id aÅ /etc/machine-id: " -#: ../gio/gdbusproxy.c:1624 +#: ../gio/gdbusproxy.c:1611 #, c-format msgid "Error calling StartServiceByName for %s: " -msgstr "Eraro dum voko de StartServiceByName por %s:" +msgstr "Eraro dum voko de StartServiceByName por %s: " -#: ../gio/gdbusproxy.c:1645 +#: ../gio/gdbusproxy.c:1634 #, c-format msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "Neatendata respondo %d de StartServiceByName(\"%s\") metodo" -#: ../gio/gdbusproxy.c:2726 ../gio/gdbusproxy.c:2860 +#: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853 msgid "" "Cannot invoke method; proxy is for a well-known name without an owner and " "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag" @@ -662,27 +1053,35 @@ msgstr "Abstrakta nomspaco nesubtenatas" msgid "Cannot specify nonce file when creating a server" msgstr "Ne eblas specifi 'nonce'-dosieron dum kreo de servilo" -#: ../gio/gdbusserver.c:872 -#, c-format -msgid "Error writing nonce file at '%s': %s" +#: ../gio/gdbusserver.c:873 +#, fuzzy, c-format +#| msgid "Error writing nonce file at '%s': %s" +msgid "Error writing nonce file at “%sâ€: %s" msgstr "Eraro dum skribo de 'nonce'-dosiero ĉe '%s': %s" -#: ../gio/gdbusserver.c:1038 -#, c-format -msgid "The string '%s' is not a valid D-Bus GUID" +#: ../gio/gdbusserver.c:1044 +#, fuzzy, c-format +#| msgid "The string '%s' is not a valid D-Bus GUID" +msgid "The string “%s†is not a valid D-Bus GUID" msgstr "La ĉeno '%s' ne estas valida D-Bus GUID" -#: ../gio/gdbusserver.c:1078 -#, c-format -msgid "Cannot listen on unsupported transport '%s'" +#: ../gio/gdbusserver.c:1084 +#, fuzzy, c-format +#| msgid "Cannot listen on unsupported transport '%s'" +msgid "Cannot listen on unsupported transport “%sâ€" msgstr "Ne eblas aÅskulti sur nesubtenata transporto '%s'" -#: ../gio/gdbus-tool.c:88 -msgid "COMMAND" -msgstr "KOMANDO" - -#: ../gio/gdbus-tool.c:93 -#, c-format +#: ../gio/gdbus-tool.c:95 +#, fuzzy, c-format +#| msgid "" +#| "Commands:\n" +#| " help Shows this information\n" +#| " introspect Introspect a remote object\n" +#| " monitor Monitor a remote object\n" +#| " call Invoke a method on a remote object\n" +#| " emit Emit a signal\n" +#| "\n" +#| "Use \"%s COMMAND --help\" to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -690,8 +1089,9 @@ msgid "" " monitor Monitor a remote object\n" " call Invoke a method on a remote object\n" " emit Emit a signal\n" +" wait Wait for a bus name to appear\n" "\n" -"Use \"%s COMMAND --help\" to get help on each command.\n" +"Use “%s COMMAND --help†to get help on each command.\n" msgstr "" "Komandoj:\n" " help Montri ĉi tiu informojn\n" @@ -702,475 +1102,624 @@ msgstr "" "\n" "Uzi \"%s KOMANDON --help\" por akiri helpon pri ĉiu komando.\n" -#: ../gio/gdbus-tool.c:162 ../gio/gdbus-tool.c:218 ../gio/gdbus-tool.c:290 -#: ../gio/gdbus-tool.c:314 ../gio/gdbus-tool.c:691 ../gio/gdbus-tool.c:1010 -#: ../gio/gdbus-tool.c:1443 +#: ../gio/gdbus-tool.c:165 ../gio/gdbus-tool.c:227 ../gio/gdbus-tool.c:299 +#: ../gio/gdbus-tool.c:323 ../gio/gdbus-tool.c:725 ../gio/gdbus-tool.c:1068 +#: ../gio/gdbus-tool.c:1510 #, c-format msgid "Error: %s\n" msgstr "Eraro: %s\n" -#: ../gio/gdbus-tool.c:173 ../gio/gdbus-tool.c:231 ../gio/gdbus-tool.c:1459 +#: ../gio/gdbus-tool.c:176 ../gio/gdbus-tool.c:240 ../gio/gdbus-tool.c:1526 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "Eraro analizanta introspektan XML-datumaron: %s\n" -#: ../gio/gdbus-tool.c:348 +#: ../gio/gdbus-tool.c:209 +#, c-format +#| msgid "Error: %s is not a valid member name\n" +msgid "Error: %s is not a valid name\n" +msgstr "Eraro: %s ne estas valida nomo\n" + +#: ../gio/gdbus-tool.c:357 msgid "Connect to the system bus" msgstr "Konekti al la systemabuso" -#: ../gio/gdbus-tool.c:349 +#: ../gio/gdbus-tool.c:358 msgid "Connect to the session bus" msgstr "Konekti al la seanca buso" -#: ../gio/gdbus-tool.c:350 +#: ../gio/gdbus-tool.c:359 msgid "Connect to given D-Bus address" msgstr "Konekti al donita D-Buso adreso" -#: ../gio/gdbus-tool.c:360 +#: ../gio/gdbus-tool.c:369 msgid "Connection Endpoint Options:" msgstr "Opcioj de konekta finpunkto:" -#: ../gio/gdbus-tool.c:361 +#: ../gio/gdbus-tool.c:370 msgid "Options specifying the connection endpoint" msgstr "Opcioj specifantaj la konektan finpunkton" -#: ../gio/gdbus-tool.c:383 +#: ../gio/gdbus-tool.c:392 #, c-format msgid "No connection endpoint specified" msgstr "Ne konekta finpunkto specifita" -#: ../gio/gdbus-tool.c:393 +#: ../gio/gdbus-tool.c:402 #, c-format msgid "Multiple connection endpoints specified" msgstr "Multoblaj konektaj finpunktoj specifitaj" -#: ../gio/gdbus-tool.c:463 -#, c-format +#: ../gio/gdbus-tool.c:472 +#, fuzzy, c-format +#| msgid "" +#| "Warning: According to introspection data, interface '%s' does not exist\n" msgid "" -"Warning: According to introspection data, interface '%s' does not exist\n" +"Warning: According to introspection data, interface “%s†does not exist\n" msgstr "Averto: LaÅ introspekta datumaro, interfaco '%s' ne ekzistas\n" -#: ../gio/gdbus-tool.c:472 -#, c-format +#: ../gio/gdbus-tool.c:481 +#, fuzzy, c-format +#| msgid "" +#| "Warning: According to introspection data, method '%s' does not exist on " +#| "interface '%s'\n" msgid "" -"Warning: According to introspection data, method '%s' does not exist on " -"interface '%s'\n" +"Warning: According to introspection data, method “%s†does not exist on " +"interface “%sâ€\n" msgstr "" -"Averto: LaÅ introspekta datumaro, metodo '%s' ne ekzistas sur interfaco '" -"%s'\n" +"Averto: LaÅ introspekta datumaro, metodo '%s' ne ekzistas sur interfaco " +"'%s'\n" -#: ../gio/gdbus-tool.c:534 +#: ../gio/gdbus-tool.c:543 msgid "Optional destination for signal (unique name)" msgstr "Malnepra celo por signalo (unika nomo)" -#: ../gio/gdbus-tool.c:535 +#: ../gio/gdbus-tool.c:544 msgid "Object path to emit signal on" msgstr "Objektovojo por sendi signalon sur" -#: ../gio/gdbus-tool.c:536 +#: ../gio/gdbus-tool.c:545 msgid "Signal and interface name" msgstr "Signalo kaj interfaco nomo" -#: ../gio/gdbus-tool.c:568 +#: ../gio/gdbus-tool.c:579 msgid "Emit a signal." msgstr "Sendi signalon." -#: ../gio/gdbus-tool.c:602 ../gio/gdbus-tool.c:822 ../gio/gdbus-tool.c:1549 -#: ../gio/gdbus-tool.c:1781 +#: ../gio/gdbus-tool.c:613 ../gio/gdbus-tool.c:858 ../gio/gdbus-tool.c:1616 +#: ../gio/gdbus-tool.c:1851 ../gio/gdbus-tool.c:2067 #, c-format msgid "Error connecting: %s\n" msgstr "Konekt-eraro: %s\n" -#: ../gio/gdbus-tool.c:614 +#: ../gio/gdbus-tool.c:625 #, c-format msgid "Error: object path not specified.\n" msgstr "Eraro: objektovojo ne specifita.\n" -#: ../gio/gdbus-tool.c:619 ../gio/gdbus-tool.c:883 ../gio/gdbus-tool.c:1607 -#: ../gio/gdbus-tool.c:1840 +#: ../gio/gdbus-tool.c:630 ../gio/gdbus-tool.c:925 ../gio/gdbus-tool.c:1681 +#: ../gio/gdbus-tool.c:1917 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "Eraro: %s ne estas valida objekto-vojo\n" -#: ../gio/gdbus-tool.c:625 +#: ../gio/gdbus-tool.c:636 #, c-format msgid "Error: signal not specified.\n" msgstr "Eraro: signalo ne specifita.\n" -#: ../gio/gdbus-tool.c:634 +#: ../gio/gdbus-tool.c:643 +#, fuzzy, c-format +#| msgid "Error: signal not specified.\n" +msgid "Error: signal must be the fully-qualified name.\n" +msgstr "Eraro: signalo ne specifita.\n" + +#: ../gio/gdbus-tool.c:651 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "Eraro: '%s' ne estas valida interfaco-nomo\n" -#: ../gio/gdbus-tool.c:640 +#: ../gio/gdbus-tool.c:657 #, c-format msgid "Error: %s is not a valid member name\n" -msgstr "'%s' ne estas valida membro-nomo\n" +msgstr "Eraro: %s ne estas valida membro-nomo\n" -#: ../gio/gdbus-tool.c:646 +#: ../gio/gdbus-tool.c:663 #, c-format msgid "Error: %s is not a valid unique bus name.\n" -msgstr "'%s' ne estas valida unika buso-nomo\n" +msgstr "Eraro: %s ne estas valida unika buso-nomo.\n" -#: ../gio/gdbus-tool.c:669 ../gio/gdbus-tool.c:982 +#. Use the original non-"parse-me-harder" error +#: ../gio/gdbus-tool.c:700 ../gio/gdbus-tool.c:1037 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "Eraro dum sintaksa analizo de la parametro %d: %s\n" -#: ../gio/gdbus-tool.c:698 +#: ../gio/gdbus-tool.c:732 #, c-format msgid "Error flushing connection: %s\n" msgstr "Eraro dum elbufrigo de la konekto: %s\n" -#: ../gio/gdbus-tool.c:725 +#: ../gio/gdbus-tool.c:759 msgid "Destination name to invoke method on" msgstr "Nomo de celvojo por envoki sur Äin metodon" -#: ../gio/gdbus-tool.c:726 +#: ../gio/gdbus-tool.c:760 msgid "Object path to invoke method on" msgstr "Vojo al objekto por envoki sur Äin metodon" -#: ../gio/gdbus-tool.c:727 +#: ../gio/gdbus-tool.c:761 msgid "Method and interface name" msgstr "Metodo- kaj interfaco-nomo" -#: ../gio/gdbus-tool.c:728 +#: ../gio/gdbus-tool.c:762 msgid "Timeout in seconds" msgstr "Tempolimo en sekundoj" -#: ../gio/gdbus-tool.c:767 +#: ../gio/gdbus-tool.c:803 msgid "Invoke a method on a remote object." msgstr "Envoki metodon sur fora objekto." -#: ../gio/gdbus-tool.c:842 ../gio/gdbus-tool.c:1568 ../gio/gdbus-tool.c:1800 +#: ../gio/gdbus-tool.c:878 ../gio/gdbus-tool.c:1635 ../gio/gdbus-tool.c:1870 #, c-format msgid "Error: Destination is not specified\n" msgstr "Eraro: Celzono ne estas specifita\n" -#: ../gio/gdbus-tool.c:863 ../gio/gdbus-tool.c:1587 +#: ../gio/gdbus-tool.c:890 ../gio/gdbus-tool.c:1652 ../gio/gdbus-tool.c:1882 +#, c-format +#| msgid "Error: %s is not a valid member name\n" +msgid "Error: %s is not a valid bus name\n" +msgstr "Eraro: %s ne estas valida bus-nomo\n" + +#: ../gio/gdbus-tool.c:905 ../gio/gdbus-tool.c:1661 #, c-format msgid "Error: Object path is not specified\n" msgstr "Eraro: Objektvojo ne estas specifita\n" -#: ../gio/gdbus-tool.c:898 +#: ../gio/gdbus-tool.c:940 #, c-format msgid "Error: Method name is not specified\n" msgstr "Eraro: Metodonomo ne estas specifita\n" -#: ../gio/gdbus-tool.c:909 -#, c-format -msgid "Error: Method name '%s' is invalid\n" +#: ../gio/gdbus-tool.c:951 +#, fuzzy, c-format +#| msgid "Error: Method name '%s' is invalid\n" +msgid "Error: Method name “%s†is invalid\n" msgstr "Eraro: Metodonomo'%s' estas nevalida\n" -#: ../gio/gdbus-tool.c:974 -#, c-format -msgid "Error parsing parameter %d of type '%s': %s\n" +#: ../gio/gdbus-tool.c:1029 +#, fuzzy, c-format +#| msgid "Error parsing parameter %d of type '%s': %s\n" +msgid "Error parsing parameter %d of type “%sâ€: %s\n" msgstr "Eraro dum sintaksa analizo de la parametro %d de tipo '%s': %s\n" -#: ../gio/gdbus-tool.c:1406 +#: ../gio/gdbus-tool.c:1473 msgid "Destination name to introspect" msgstr "Nomo de celo por introspekti" -#: ../gio/gdbus-tool.c:1407 +#: ../gio/gdbus-tool.c:1474 msgid "Object path to introspect" msgstr "Objektvojo por introspekti" -#: ../gio/gdbus-tool.c:1408 +#: ../gio/gdbus-tool.c:1475 msgid "Print XML" msgstr "Presi XML" -#: ../gio/gdbus-tool.c:1409 +#: ../gio/gdbus-tool.c:1476 msgid "Introspect children" msgstr "Introspekti idoj" -#: ../gio/gdbus-tool.c:1410 +#: ../gio/gdbus-tool.c:1477 msgid "Only print properties" msgstr "Nur presi agordojn" -#: ../gio/gdbus-tool.c:1501 +#: ../gio/gdbus-tool.c:1568 msgid "Introspect a remote object." msgstr "Introspekti foran objekton." -#: ../gio/gdbus-tool.c:1699 +#: ../gio/gdbus-tool.c:1773 msgid "Destination name to monitor" msgstr "Nomo de celo de kontrolota" -#: ../gio/gdbus-tool.c:1700 +#: ../gio/gdbus-tool.c:1774 msgid "Object path to monitor" msgstr "Vojo de kontrolota objekto" -#: ../gio/gdbus-tool.c:1733 +#: ../gio/gdbus-tool.c:1803 msgid "Monitor a remote object." msgstr "Kontroli foran objekton." -#: ../gio/gdesktopappinfo.c:575 ../gio/gwin32appinfo.c:221 +#: ../gio/gdbus-tool.c:1980 +msgid "Service to activate before waiting for the other one (well-known name)" +msgstr "" + +#: ../gio/gdbus-tool.c:1983 +msgid "" +"Timeout to wait for before exiting with an error (seconds); 0 for no timeout " +"(default)" +msgstr "" + +#: ../gio/gdbus-tool.c:2031 +msgid "[OPTION…] BUS-NAME" +msgstr "" + +#: ../gio/gdbus-tool.c:2033 +msgid "Wait for a bus name to appear." +msgstr "" + +#: ../gio/gdbus-tool.c:2109 +#, fuzzy, c-format +#| msgid "Error: object path not specified.\n" +msgid "Error: A service to activate for must be specified.\n" +msgstr "Eraro: objektovojo ne specifita.\n" + +#: ../gio/gdbus-tool.c:2114 +#, fuzzy, c-format +#| msgid "Error: object path not specified.\n" +msgid "Error: A service to wait for must be specified.\n" +msgstr "Eraro: objektovojo ne specifita.\n" + +#: ../gio/gdbus-tool.c:2119 +#, c-format +msgid "Error: Too many arguments.\n" +msgstr "" + +#: ../gio/gdbus-tool.c:2127 ../gio/gdbus-tool.c:2134 +#, c-format +#| msgid "Error: %s is not a valid unique bus name.\n" +msgid "Error: %s is not a valid well-known bus name.\n" +msgstr "Eraro: %s ne estas valida konata buso-nomo.\n" + +#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 msgid "Unnamed" msgstr "Sennoma" -#: ../gio/gdesktopappinfo.c:988 -msgid "Desktop file didn't specify Exec field" +#: ../gio/gdesktopappinfo.c:2407 +#, fuzzy +#| msgid "Desktop file didn't specify Exec field" +msgid "Desktop file didn’t specify Exec field" msgstr "Labortabla dosiero ne specifis Exec-kampon" -#: ../gio/gdesktopappinfo.c:1276 +#: ../gio/gdesktopappinfo.c:2692 msgid "Unable to find terminal required for application" msgstr "Ne eblas trovi terminalon bezonata por aplikaĵo" -#: ../gio/gdesktopappinfo.c:1563 -#, c-format -msgid "Can't create user application configuration folder %s: %s" +#: ../gio/gdesktopappinfo.c:3100 +#, fuzzy, c-format +#| msgid "Can't create user application configuration folder %s: %s" +msgid "Can’t create user application configuration folder %s: %s" msgstr "Ne eblas krei uzanto-aplikaĵan agordodosierujon %s: %s" -#: ../gio/gdesktopappinfo.c:1567 -#, c-format -msgid "Can't create user MIME configuration folder %s: %s" +#: ../gio/gdesktopappinfo.c:3104 +#, fuzzy, c-format +#| msgid "Can't create user MIME configuration folder %s: %s" +msgid "Can’t create user MIME configuration folder %s: %s" msgstr "Ne eblas krei por uzanto MIME-an agordodosierujon %s: %s" -#: ../gio/gdesktopappinfo.c:1807 ../gio/gdesktopappinfo.c:1831 +#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 msgid "Application information lacks an identifier" msgstr "Mankas identigilo en la aplikaĵaj informoj" -#: ../gio/gdesktopappinfo.c:2055 -#, c-format -msgid "Can't create user desktop file %s" +#: ../gio/gdesktopappinfo.c:3602 +#, fuzzy, c-format +#| msgid "Can't create user desktop file %s" +msgid "Can’t create user desktop file %s" msgstr "Ne eblas krei por uzanto labortablan dosieron %s" -#: ../gio/gdesktopappinfo.c:2171 +#: ../gio/gdesktopappinfo.c:3736 #, c-format msgid "Custom definition for %s" msgstr "Propra difino por %s" -#: ../gio/gdrive.c:363 -msgid "drive doesn't implement eject" +#: ../gio/gdrive.c:417 +#, fuzzy +#| msgid "drive doesn't implement eject" +msgid "drive doesn’t implement eject" msgstr "diskingo ne realigas elĵeton" #. Translators: This is an error #. * message for drive objects that #. * don't implement any of eject or eject_with_operation. -#: ../gio/gdrive.c:444 -msgid "drive doesn't implement eject or eject_with_operation" +#: ../gio/gdrive.c:495 +#, fuzzy +#| msgid "drive doesn't implement eject or eject_with_operation" +msgid "drive doesn’t implement eject or eject_with_operation" msgstr "diskingo ne realigas 'eject' aÅ eject_with_operation" -#: ../gio/gdrive.c:521 -msgid "drive doesn't implement polling for media" +#: ../gio/gdrive.c:571 +#, fuzzy +#| msgid "drive doesn't implement polling for media" +msgid "drive doesn’t implement polling for media" msgstr "diskingo ne realigas demandadon pri datumportiloj" -#: ../gio/gdrive.c:728 -msgid "drive doesn't implement start" +#: ../gio/gdrive.c:776 +#, fuzzy +#| msgid "drive doesn't implement start" +msgid "drive doesn’t implement start" msgstr "diskingo ne realigas start (starton)" -#: ../gio/gdrive.c:831 -msgid "drive doesn't implement stop" +#: ../gio/gdrive.c:878 +#, fuzzy +#| msgid "drive doesn't implement stop" +msgid "drive doesn’t implement stop" msgstr "diskingo ne realigas stop (halton)" -#: ../gio/gdummytlsbackend.c:168 ../gio/gdummytlsbackend.c:288 -#: ../gio/gdummytlsbackend.c:378 +#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317 +#: ../gio/gdummytlsbackend.c:509 msgid "TLS support is not available" msgstr "TLS subteno ne estas havebla" -#: ../gio/gemblem.c:324 -#, c-format -msgid "Can't handle version %d of GEmblem encoding" +#: ../gio/gdummytlsbackend.c:419 +#, fuzzy +#| msgid "TLS support is not available" +msgid "DTLS support is not available" +msgstr "TLS subteno ne estas havebla" + +#: ../gio/gemblem.c:323 +#, fuzzy, c-format +#| msgid "Can't handle version %d of GEmblem encoding" +msgid "Can’t handle version %d of GEmblem encoding" msgstr "Ne eblas trakti version %d de GEmblem kodoprezento" -#: ../gio/gemblem.c:334 +#: ../gio/gemblem.c:333 #, c-format msgid "Malformed number of tokens (%d) in GEmblem encoding" msgstr "Misformita nombro da ĵetonoj (%d) en GEmblem kodoprezento" -#: ../gio/gemblemedicon.c:367 -#, c-format -msgid "Can't handle version %d of GEmblemedIcon encoding" +#: ../gio/gemblemedicon.c:362 +#, fuzzy, c-format +#| msgid "Can't handle version %d of GEmblemedIcon encoding" +msgid "Can’t handle version %d of GEmblemedIcon encoding" msgstr "Ne eblas trakti version %d de GEmblemedIcon kodoprezento" -#: ../gio/gemblemedicon.c:377 +#: ../gio/gemblemedicon.c:372 #, c-format msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding" msgstr "Misformita nombro da ĵetonoj (%d) en GEmblemedIcon kodoprezento" -#: ../gio/gemblemedicon.c:400 +#: ../gio/gemblemedicon.c:395 msgid "Expected a GEmblem for GEmblemedIcon" msgstr "Atendis GEmblem por GEmblemedIcon" -#: ../gio/gfile.c:874 ../gio/gfile.c:1105 ../gio/gfile.c:1240 -#: ../gio/gfile.c:1477 ../gio/gfile.c:1531 ../gio/gfile.c:1588 -#: ../gio/gfile.c:1671 ../gio/gfile.c:1726 ../gio/gfile.c:1786 -#: ../gio/gfile.c:1840 ../gio/gfile.c:3312 ../gio/gfile.c:3366 -#: ../gio/gfile.c:3500 ../gio/gfile.c:3541 ../gio/gfile.c:3871 -#: ../gio/gfile.c:4273 ../gio/gfile.c:4359 ../gio/gfile.c:4448 -#: ../gio/gfile.c:4546 ../gio/gfile.c:4633 ../gio/gfile.c:4727 -#: ../gio/gfile.c:5048 ../gio/gfile.c:5315 ../gio/gfile.c:5380 -#: ../gio/gfile.c:7008 ../gio/gfile.c:7098 ../gio/gfile.c:7184 -#: ../gio/win32/gwinhttpfile.c:439 +#: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345 +#: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696 +#: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901 +#: ../gio/gfile.c:1956 ../gio/gfile.c:3609 ../gio/gfile.c:3664 +#: ../gio/gfile.c:3900 ../gio/gfile.c:3942 ../gio/gfile.c:4410 +#: ../gio/gfile.c:4821 ../gio/gfile.c:4906 ../gio/gfile.c:4996 +#: ../gio/gfile.c:5093 ../gio/gfile.c:5180 ../gio/gfile.c:5281 +#: ../gio/gfile.c:7822 ../gio/gfile.c:7912 ../gio/gfile.c:7996 +#: ../gio/win32/gwinhttpfile.c:437 msgid "Operation not supported" msgstr "Operacio ne estas subtenata" -#. Translators: This is an error message when trying to find the -#. * enclosing (user visible) mount of a file, but none exists. -#. Translators: This is an error message when trying to -#. * find the enclosing (user visible) mount of a file, but -#. * none exists. -#. Translators: This is an error message when trying to find -#. * the enclosing (user visible) mount of a file, but none -#. * exists. -#: ../gio/gfile.c:1361 ../gio/glocalfile.c:1070 ../gio/glocalfile.c:1081 -#: ../gio/glocalfile.c:1094 +#. Translators: This is an error message when +#. * trying to find the enclosing (user visible) +#. * mount of a file, but none exists. +#. +#: ../gio/gfile.c:1468 msgid "Containing mount does not exist" msgstr "Enhavantan munton ne ekzistas" -#: ../gio/gfile.c:2414 ../gio/glocalfile.c:2289 -msgid "Can't copy over directory" +#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2375 +#, fuzzy +#| msgid "Can't copy over directory" +msgid "Can’t copy over directory" msgstr "Ne eblas kopii super dosierujo" -#: ../gio/gfile.c:2475 -msgid "Can't copy directory over directory" +#: ../gio/gfile.c:2575 +#, fuzzy +#| msgid "Can't copy directory over directory" +msgid "Can’t copy directory over directory" msgstr "Ne eblas kopii dosierujon super dosierujo" -#: ../gio/gfile.c:2483 ../gio/glocalfile.c:2298 +#: ../gio/gfile.c:2583 msgid "Target file exists" msgstr "Celdosiero jam ekzistas" -#: ../gio/gfile.c:2501 -msgid "Can't recursively copy directory" +#: ../gio/gfile.c:2602 +#, fuzzy +#| msgid "Can't recursively copy directory" +msgid "Can’t recursively copy directory" msgstr "Ne eblas rikure kopii dosierujon" -#: ../gio/gfile.c:2761 +#: ../gio/gfile.c:2889 msgid "Splice not supported" msgstr "Splisi ne subtenata" -#: ../gio/gfile.c:2765 +#: ../gio/gfile.c:2893 #, c-format msgid "Error splicing file: %s" msgstr "Eraro dum splisado de la dosiero: %s" -#: ../gio/gfile.c:2912 -msgid "Can't copy special file" +#: ../gio/gfile.c:3024 +#| msgid "Move between mounts not supported" +msgid "Copy (reflink/clone) between mounts is not supported" +msgstr "Kopii (reflink/clone) inter muntoj ne estas subtenata" + +#: ../gio/gfile.c:3028 +msgid "Copy (reflink/clone) is not supported or invalid" +msgstr "" + +#: ../gio/gfile.c:3033 +msgid "Copy (reflink/clone) is not supported or didn’t work" +msgstr "" + +#: ../gio/gfile.c:3096 +#, fuzzy +#| msgid "Can't copy special file" +msgid "Can’t copy special file" msgstr "Ne eblas kopii specialan dosieron" -#: ../gio/gfile.c:3490 +#: ../gio/gfile.c:3890 msgid "Invalid symlink value given" msgstr "Invalida simligila valoro donita" -#: ../gio/gfile.c:3584 +#: ../gio/gfile.c:4051 msgid "Trash not supported" msgstr "Rubujo ne estas subtenata" -#: ../gio/gfile.c:3633 +#: ../gio/gfile.c:4163 #, c-format -msgid "File names cannot contain '%c'" -msgstr "Dosiernomoj ne povas enhavi '%c'" +#| msgid "File names cannot contain '%c'" +msgid "File names cannot contain “%câ€" +msgstr "Dosiernomoj ne povas enhavi “%câ€" -#: ../gio/gfile.c:6067 ../gio/gvolume.c:332 -msgid "volume doesn't implement mount" +#: ../gio/gfile.c:6609 ../gio/gvolume.c:363 +#, fuzzy +#| msgid "volume doesn't implement mount" +msgid "volume doesn’t implement mount" msgstr "datumportilo ne realigas 'mount'" -#: ../gio/gfile.c:6178 +#: ../gio/gfile.c:6718 msgid "No application is registered as handling this file" msgstr "Neniu aplikaĵo estas registrita kiel traktilo por ĉi tiu dosiero" -#: ../gio/gfileenumerator.c:205 +#: ../gio/gfileenumerator.c:212 msgid "Enumerator is closed" msgstr "Enumeraciilo estas fermita" -#: ../gio/gfileenumerator.c:212 ../gio/gfileenumerator.c:271 -#: ../gio/gfileenumerator.c:371 ../gio/gfileenumerator.c:480 +#: ../gio/gfileenumerator.c:219 ../gio/gfileenumerator.c:278 +#: ../gio/gfileenumerator.c:377 ../gio/gfileenumerator.c:476 msgid "File enumerator has outstanding operation" msgstr "Dosierenumeraciilo havas restantan operacion" -#: ../gio/gfileenumerator.c:361 ../gio/gfileenumerator.c:470 +#: ../gio/gfileenumerator.c:368 ../gio/gfileenumerator.c:467 msgid "File enumerator is already closed" msgstr "Dosierenumeraciilo jam estas fermita" -#: ../gio/gfileicon.c:237 -#, c-format -msgid "Can't handle version %d of GFileIcon encoding" +#: ../gio/gfileicon.c:236 +#, fuzzy, c-format +#| msgid "Can't handle version %d of GFileIcon encoding" +msgid "Can’t handle version %d of GFileIcon encoding" msgstr "Ne eblas trakti version %d de GFileIcon-kodoprezento" -#: ../gio/gfileicon.c:247 +#: ../gio/gfileicon.c:246 msgid "Malformed input data for GFileIcon" msgstr "Esti misformita eniga datumaro por GFileIcon" -#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:420 -#: ../gio/gfileiostream.c:170 ../gio/gfileoutputstream.c:169 -#: ../gio/gfileoutputstream.c:523 -msgid "Stream doesn't support query_info" +#: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394 +#: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164 +#: ../gio/gfileoutputstream.c:497 +#, fuzzy +#| msgid "Stream doesn't support query_info" +msgid "Stream doesn’t support query_info" msgstr "Fluo ne subtenas query_info-on" -#: ../gio/gfileinputstream.c:335 ../gio/gfileiostream.c:387 -#: ../gio/gfileoutputstream.c:381 +#: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379 +#: ../gio/gfileoutputstream.c:371 msgid "Seek not supported on stream" msgstr "Serĉo ne estas subtenata en fluo" -#: ../gio/gfileinputstream.c:379 +#: ../gio/gfileinputstream.c:369 msgid "Truncate not allowed on input stream" msgstr "Trunki ne permesita en eniga fluo" -#: ../gio/gfileiostream.c:463 ../gio/gfileoutputstream.c:457 +#: ../gio/gfileiostream.c:455 ../gio/gfileoutputstream.c:447 msgid "Truncate not supported on stream" msgstr "Trunki ne permesita en fluo" -#: ../gio/gicon.c:284 +#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476 +#: ../glib/gconvert.c:1650 +msgid "Invalid hostname" +msgstr "Nevalida gastiga komputilonomo" + +#: ../gio/ghttpproxy.c:143 +msgid "Bad HTTP proxy reply" +msgstr "" + +#: ../gio/ghttpproxy.c:159 +#, fuzzy +#| msgid "The connection is closed" +msgid "HTTP proxy connection not allowed" +msgstr "La konekto estas fermita" + +#: ../gio/ghttpproxy.c:164 +msgid "HTTP proxy authentication failed" +msgstr "" + +#: ../gio/ghttpproxy.c:167 +msgid "HTTP proxy authentication required" +msgstr "" + +#: ../gio/ghttpproxy.c:171 +#, c-format +#| msgid "The connection is closed" +msgid "HTTP proxy connection failed: %i" +msgstr "HTTP-prokurila konekto malsukcesis: %i" + +#: ../gio/ghttpproxy.c:269 +msgid "HTTP proxy server closed connection unexpectedly." +msgstr "" + +#: ../gio/gicon.c:290 #, c-format msgid "Wrong number of tokens (%d)" msgstr "MalÄusta nombro de ĵetonoj (%d)" -#: ../gio/gicon.c:304 +#: ../gio/gicon.c:310 #, c-format msgid "No type for class name %s" msgstr "Neniu tipo por klasnomo %s" -#: ../gio/gicon.c:314 +#: ../gio/gicon.c:320 #, c-format msgid "Type %s does not implement the GIcon interface" msgstr "Tipo %s ne realigas la GIcon interfaco" -#: ../gio/gicon.c:325 +#: ../gio/gicon.c:331 #, c-format msgid "Type %s is not classed" msgstr "Tipo %s ne estas klasata" -#: ../gio/gicon.c:339 +#: ../gio/gicon.c:345 #, c-format msgid "Malformed version number: %s" msgstr "Misformita versionumero: %s" -#: ../gio/gicon.c:353 +#: ../gio/gicon.c:359 #, c-format msgid "Type %s does not implement from_tokens() on the GIcon interface" msgstr "Tipo %s ne realigas from_tokens() sur la GIcon Interfaco" -#: ../gio/gicon.c:430 -msgid "Can't handle the supplied version the icon encoding" +#: ../gio/gicon.c:461 +#, fuzzy +#| msgid "Can't handle the supplied version the icon encoding" +msgid "Can’t handle the supplied version of the icon encoding" msgstr "Ne eblas trakti la provizitan version de bildsimbolo kodoprezento" -#: ../gio/ginetaddressmask.c:184 +#: ../gio/ginetaddressmask.c:182 msgid "No address specified" msgstr "Neniu adreso specifita" -#: ../gio/ginetaddressmask.c:192 +#: ../gio/ginetaddressmask.c:190 #, c-format msgid "Length %u is too long for address" msgstr "Longeco %u estas tro longa por adreso" -#: ../gio/ginetaddressmask.c:225 +#: ../gio/ginetaddressmask.c:223 msgid "Address has bits set beyond prefix length" msgstr "" -#: ../gio/ginetaddressmask.c:304 +#: ../gio/ginetaddressmask.c:300 #, c-format -msgid "Could not parse '%s' as IP address mask" -msgstr "Ne eblas analizi na '%s' kiel IP-adresa masko" +#| msgid "Could not parse '%s' as IP address mask" +msgid "Could not parse “%s†as IP address mask" +msgstr "Ne eblas analizi na “%s†kiel IP-adresa masko" -#: ../gio/ginetsocketaddress.c:206 ../gio/ginetsocketaddress.c:223 -#: ../gio/gunixsocketaddress.c:221 +#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 +#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 msgid "Not enough space for socket address" msgstr "Ne sufiĉa spaco por kontaktskatolo adreso" -#: ../gio/ginetsocketaddress.c:238 +#: ../gio/ginetsocketaddress.c:235 msgid "Unsupported socket address" msgstr "Nesubtenata kontaktskatolo adreso" -#: ../gio/ginputstream.c:194 -msgid "Input stream doesn't implement read" +#: ../gio/ginputstream.c:188 +#, fuzzy +#| msgid "Input stream doesn't implement read" +msgid "Input stream doesn’t implement read" msgstr "Eniga fluo ne realigas legon" #. Translators: This is an error you get if there is already an @@ -1179,122 +1728,784 @@ msgstr "Eniga fluo ne realigas legon" #. 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:898 ../gio/giostream.c:302 -#: ../gio/goutputstream.c:1238 +#: ../gio/ginputstream.c:1218 ../gio/giostream.c:310 +#: ../gio/goutputstream.c:1670 msgid "Stream has outstanding operation" msgstr "Fluo havas restantan operacion" -#: ../gio/glib-compile-resources.c:144 ../gio/glib-compile-schemas.c:1449 +#: ../gio/gio-tool.c:160 +msgid "Copy with file" +msgstr "" + +#: ../gio/gio-tool.c:164 +msgid "Keep with file when moved" +msgstr "" + +#: ../gio/gio-tool.c:205 +msgid "“version†takes no arguments" +msgstr "" + +#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857 +msgid "Usage:" +msgstr "Uzo:" + +#: ../gio/gio-tool.c:210 +msgid "Print version information and exit." +msgstr "" + +#: ../gio/gio-tool.c:224 +msgid "[ARGS...]" +msgstr "" + +#: ../gio/gio-tool.c:226 +msgid "Commands:" +msgstr "" + +#: ../gio/gio-tool.c:229 +msgid "Concatenate files to standard output" +msgstr "" + +#: ../gio/gio-tool.c:230 +msgid "Copy one or more files" +msgstr "" + +#: ../gio/gio-tool.c:231 +msgid "Show information about locations" +msgstr "" + +#: ../gio/gio-tool.c:232 +msgid "List the contents of locations" +msgstr "" + +#: ../gio/gio-tool.c:233 +msgid "Get or set the handler for a mimetype" +msgstr "" + +#: ../gio/gio-tool.c:234 +#, fuzzy +#| msgid "Can't open directory" +msgid "Create directories" +msgstr "Ne eblas malfermi dosierujon" + +#: ../gio/gio-tool.c:235 +msgid "Monitor files and directories for changes" +msgstr "" + +#: ../gio/gio-tool.c:236 +msgid "Mount or unmount the locations" +msgstr "" + +#: ../gio/gio-tool.c:237 +msgid "Move one or more files" +msgstr "" + +#: ../gio/gio-tool.c:238 +msgid "Open files with the default application" +msgstr "" + +#: ../gio/gio-tool.c:239 +msgid "Rename a file" +msgstr "" + +#: ../gio/gio-tool.c:240 +msgid "Delete one or more files" +msgstr "" + +#: ../gio/gio-tool.c:241 +msgid "Read from standard input and save" +msgstr "" + +#: ../gio/gio-tool.c:242 +msgid "Set a file attribute" +msgstr "" + +#: ../gio/gio-tool.c:243 +msgid "Move files or directories to the trash" +msgstr "" + +#: ../gio/gio-tool.c:244 +msgid "Lists the contents of locations in a tree" +msgstr "" + +#: ../gio/gio-tool.c:246 +#, c-format +msgid "Use %s to get detailed help.\n" +msgstr "" + +#: ../gio/gio-tool-cat.c:80 +#| msgid "Error writing to file: %s" +msgid "Error writing to stdout" +msgstr "Eraro dum skribado al stdout" + +#. Translators: commandline placeholder +#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:282 +#: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48 +#: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39 +#: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43 +#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141 +#: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48 +#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89 +#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239 +#, fuzzy +#| msgid "SECTION" +msgid "LOCATION" +msgstr "SEKCIO" + +#: ../gio/gio-tool-cat.c:129 +msgid "Concatenate files and print to standard output." +msgstr "" + +#: ../gio/gio-tool-cat.c:131 +msgid "" +"gio cat works just like the traditional cat utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/file.txt as location." +msgstr "" + +#: ../gio/gio-tool-cat.c:153 ../gio/gio-tool-info.c:313 +#: ../gio/gio-tool-mkdir.c:76 ../gio/gio-tool-monitor.c:228 +#: ../gio/gio-tool-open.c:71 ../gio/gio-tool-remove.c:72 +msgid "No locations given" +msgstr "" + +#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38 +#, fuzzy +#| msgid "Target file is a directory" +msgid "No target directory" +msgstr "Celdosiero estas dosierujo" + +#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39 +msgid "Show progress" +msgstr "" + +#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40 +msgid "Prompt before overwrite" +msgstr "" + +#: ../gio/gio-tool-copy.c:45 +msgid "Preserve all attributes" +msgstr "" + +#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41 +#: ../gio/gio-tool-save.c:49 +#, fuzzy +#| msgid "Backup file creation failed" +msgid "Backup existing destination files" +msgstr "Sekurkopia kreado malsukcesis" + +#: ../gio/gio-tool-copy.c:47 +msgid "Never follow symbolic links" +msgstr "" + +#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67 +#, c-format +msgid "Transferred %s out of %s (%s/s)" +msgstr "" + +#. Translators: commandline placeholder +#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94 +msgid "SOURCE" +msgstr "" + +#. Translators: commandline placeholder +#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94 +#: ../gio/gio-tool-save.c:165 +msgid "DESTINATION" +msgstr "" + +#: ../gio/gio-tool-copy.c:103 +msgid "Copy one or more files from SOURCE to DESTINATION." +msgstr "" + +#: ../gio/gio-tool-copy.c:105 +msgid "" +"gio copy is similar to the traditional cp utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/file.txt as location." +msgstr "" + +#: ../gio/gio-tool-copy.c:147 +#, fuzzy, c-format +#| msgid "The resource at '%s' is not a directory" +msgid "Destination %s is not a directory" +msgstr "La risurco ĉe '%s' ne estas dosierujo" + +#: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185 +#, c-format +msgid "%s: overwrite “%sâ€? " +msgstr "" + +#: ../gio/gio-tool-info.c:34 +msgid "List writable attributes" +msgstr "" + +#: ../gio/gio-tool-info.c:35 +#| msgid "Error getting filesystem info: %s" +msgid "Get file system info" +msgstr "Akiro de dosiersistema informo" + +#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35 +msgid "The attributes to get" +msgstr "" + +#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35 +msgid "ATTRIBUTES" +msgstr "" + +#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34 +msgid "Don’t follow symbolic links" +msgstr "" + +#: ../gio/gio-tool-info.c:75 +#, c-format +msgid "attributes:\n" +msgstr "" + +#. Translators: This is a noun and represents and attribute of a file +#: ../gio/gio-tool-info.c:127 +#, c-format +msgid "display name: %s\n" +msgstr "" + +#. Translators: This is a noun and represents and attribute of a file +#: ../gio/gio-tool-info.c:132 +#, c-format +msgid "edit name: %s\n" +msgstr "" + +#: ../gio/gio-tool-info.c:138 +#, c-format +msgid "name: %s\n" +msgstr "" + +#: ../gio/gio-tool-info.c:145 +#, c-format +msgid "type: %s\n" +msgstr "" + +#: ../gio/gio-tool-info.c:151 +#, c-format +msgid "size: " +msgstr "" + +#: ../gio/gio-tool-info.c:156 +#, c-format +msgid "hidden\n" +msgstr "" + +#: ../gio/gio-tool-info.c:159 +#, c-format +#| msgid "Error: %s\n" +msgid "uri: %s\n" +msgstr "uri: %s\n" + +#: ../gio/gio-tool-info.c:228 +#, c-format +msgid "Settable attributes:\n" +msgstr "" + +#: ../gio/gio-tool-info.c:252 +#, c-format +msgid "Writable attribute namespaces:\n" +msgstr "" + +#: ../gio/gio-tool-info.c:287 +msgid "Show information about locations." +msgstr "" + +#: ../gio/gio-tool-info.c:289 +msgid "" +"gio info is similar to the traditional ls utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/file.txt as location. File attributes can\n" +"be specified with their GIO name, e.g. standard::icon, or just by\n" +"namespace, e.g. unix, or by “*â€, which matches all attributes" +msgstr "" + +#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32 +msgid "Show hidden files" +msgstr "" + +#: ../gio/gio-tool-list.c:37 +msgid "Use a long listing format" +msgstr "" + +#: ../gio/gio-tool-list.c:39 +msgid "Print full URIs" +msgstr "" + +#: ../gio/gio-tool-list.c:170 +msgid "List the contents of the locations." +msgstr "" + +#: ../gio/gio-tool-list.c:172 +msgid "" +"gio list is similar to the traditional ls utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/file.txt as location. File attributes can\n" +"be specified with their GIO name, e.g. standard::icon" +msgstr "" + +#. Translators: commandline placeholder +#: ../gio/gio-tool-mime.c:71 +msgid "MIMETYPE" +msgstr "" + +#: ../gio/gio-tool-mime.c:71 +msgid "HANDLER" +msgstr "" + +#: ../gio/gio-tool-mime.c:76 +msgid "Get or set the handler for a mimetype." +msgstr "" + +#: ../gio/gio-tool-mime.c:78 +msgid "" +"If no handler is given, lists registered and recommended applications\n" +"for the mimetype. If a handler is given, it is set as the default\n" +"handler for the mimetype." +msgstr "" + +#: ../gio/gio-tool-mime.c:100 +msgid "Must specify a single mimetype, and maybe a handler" +msgstr "" + +#: ../gio/gio-tool-mime.c:116 +#, c-format +msgid "No default applications for “%sâ€\n" +msgstr "" + +#: ../gio/gio-tool-mime.c:122 +#, c-format +msgid "Default application for “%sâ€: %s\n" +msgstr "" + +#: ../gio/gio-tool-mime.c:127 +#, c-format +msgid "Registered applications:\n" +msgstr "" + +#: ../gio/gio-tool-mime.c:129 +#, c-format +#| msgid "Can't find application" +msgid "No registered applications\n" +msgstr "Neniu registrita aplikaĵo\n" + +#: ../gio/gio-tool-mime.c:140 +#, c-format +msgid "Recommended applications:\n" +msgstr "" + +#: ../gio/gio-tool-mime.c:142 +#, c-format +#| msgid "Can't find application" +msgid "No recommended applications\n" +msgstr "Neniu rekomendita aplikaĵo\n" + +#: ../gio/gio-tool-mime.c:162 +#, fuzzy, c-format +#| msgid "Failed to read from file '%s': %s" +msgid "Failed to load info for handler “%sâ€" +msgstr "Malsukcesis Åargi el dosiero “%sâ€" + +#: ../gio/gio-tool-mime.c:168 +#, c-format +msgid "Failed to set “%s†as the default handler for “%sâ€: %s\n" +msgstr "" + +#: ../gio/gio-tool-mkdir.c:31 +#, fuzzy +#| msgid "Can't open directory" +msgid "Create parent directories" +msgstr "Ne eblas malfermi dosierujon" + +#: ../gio/gio-tool-mkdir.c:52 +#| msgid "Can't open directory" +msgid "Create directories." +msgstr "Krei doserujojn." + +#: ../gio/gio-tool-mkdir.c:54 +msgid "" +"gio mkdir is similar to the traditional mkdir utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/mydir as location." +msgstr "" + +#: ../gio/gio-tool-monitor.c:37 +msgid "Monitor a directory (default: depends on type)" +msgstr "" + +#: ../gio/gio-tool-monitor.c:39 +msgid "Monitor a file (default: depends on type)" +msgstr "" + +#: ../gio/gio-tool-monitor.c:41 +msgid "Monitor a file directly (notices changes made via hardlinks)" +msgstr "" + +#: ../gio/gio-tool-monitor.c:43 +msgid "Monitors a file directly, but doesn’t report changes" +msgstr "" + +#: ../gio/gio-tool-monitor.c:45 +msgid "Report moves and renames as simple deleted/created events" +msgstr "" + +#: ../gio/gio-tool-monitor.c:47 +msgid "Watch for mount events" +msgstr "" + +#: ../gio/gio-tool-monitor.c:208 +msgid "Monitor files or directories for changes." +msgstr "" + +#: ../gio/gio-tool-mount.c:58 +msgid "Mount as mountable" +msgstr "" + +#: ../gio/gio-tool-mount.c:59 +msgid "Mount volume with device file" +msgstr "" + +#: ../gio/gio-tool-mount.c:59 +msgid "DEVICE" +msgstr "" + +#: ../gio/gio-tool-mount.c:60 +msgid "Unmount" +msgstr "" + +#: ../gio/gio-tool-mount.c:61 +msgid "Eject" +msgstr "" + +#: ../gio/gio-tool-mount.c:62 +msgid "Unmount all mounts with the given scheme" +msgstr "" + +#: ../gio/gio-tool-mount.c:62 +msgid "SCHEME" +msgstr "" + +#: ../gio/gio-tool-mount.c:63 +msgid "Ignore outstanding file operations when unmounting or ejecting" +msgstr "" + +#: ../gio/gio-tool-mount.c:64 +msgid "Use an anonymous user when authenticating" +msgstr "" + +#. Translator: List here is a verb as in 'List all mounts' +#: ../gio/gio-tool-mount.c:66 +msgid "List" +msgstr "" + +#: ../gio/gio-tool-mount.c:67 +msgid "Monitor events" +msgstr "" + +#: ../gio/gio-tool-mount.c:68 +#, fuzzy +#| msgid "Show help options" +msgid "Show extra information" +msgstr "Montri helpajn opciojn" + +#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276 +msgid "Anonymous access denied" +msgstr "" + +#: ../gio/gio-tool-mount.c:897 +#, c-format +msgid "Mounted %s at %s\n" +msgstr "" + +#: ../gio/gio-tool-mount.c:950 +msgid "No volume for device file" +msgstr "" + +#: ../gio/gio-tool-mount.c:1145 +msgid "Mount or unmount the locations." +msgstr "" + +#: ../gio/gio-tool-move.c:42 +msgid "Don’t use copy and delete fallback" +msgstr "" + +#: ../gio/gio-tool-move.c:99 +msgid "Move one or more files from SOURCE to DEST." +msgstr "" + +#: ../gio/gio-tool-move.c:101 +msgid "" +"gio move is similar to the traditional mv utility, but using GIO\n" +"locations instead of local files: for example, you can use something\n" +"like smb://server/resource/file.txt as location" +msgstr "" + +#: ../gio/gio-tool-move.c:142 +#, c-format +#| msgid "Target file is a directory" +msgid "Target %s is not a directory" +msgstr "Celo %s ne estas dosierujo" + +#: ../gio/gio-tool-open.c:50 +msgid "" +"Open files with the default application that\n" +"is registered to handle files of this type." +msgstr "" + +#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31 +msgid "Ignore nonexistent files, never prompt" +msgstr "" + +#: ../gio/gio-tool-remove.c:52 +msgid "Delete the given files." +msgstr "" + +#: ../gio/gio-tool-rename.c:45 +msgid "NAME" +msgstr "" + +#: ../gio/gio-tool-rename.c:50 +msgid "Rename a file." +msgstr "" + +#: ../gio/gio-tool-rename.c:70 +#| msgid "Missing argument for %s" +msgid "Missing argument" +msgstr "Mankas argumento" + +#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:195 +#: ../gio/gio-tool-set.c:137 +msgid "Too many arguments" +msgstr "" + +#: ../gio/gio-tool-rename.c:95 +#, c-format +msgid "Rename successful. New uri: %s\n" +msgstr "" + +#: ../gio/gio-tool-save.c:50 +msgid "Only create if not existing" +msgstr "" + +#: ../gio/gio-tool-save.c:51 +msgid "Append to end of file" +msgstr "" + +#: ../gio/gio-tool-save.c:52 +msgid "When creating, restrict access to the current user" +msgstr "" + +#: ../gio/gio-tool-save.c:53 +msgid "When replacing, replace as if the destination did not exist" +msgstr "" + +#. Translators: The "etag" is a token allowing to verify whether a file has been modified +#: ../gio/gio-tool-save.c:55 +msgid "Print new etag at end" +msgstr "" + +#. Translators: The "etag" is a token allowing to verify whether a file has been modified +#: ../gio/gio-tool-save.c:57 +msgid "The etag of the file being overwritten" +msgstr "" + +#: ../gio/gio-tool-save.c:57 +msgid "ETAG" +msgstr "" + +#: ../gio/gio-tool-save.c:119 +#, fuzzy +#| msgid "Error reading from handle: %s" +msgid "Error reading from standard input" +msgstr "Eraro dum lego de dosiernumero" + +#. Translators: The "etag" is a token allowing to verify whether a file has been modified +#: ../gio/gio-tool-save.c:145 +#, c-format +#| msgid "TLS support is not available" +msgid "Etag not available\n" +msgstr "Etag ne estas havebla\n" + +#: ../gio/gio-tool-save.c:168 +msgid "Read from standard input and save to DEST." +msgstr "" + +#: ../gio/gio-tool-save.c:188 +msgid "No destination given" +msgstr "" + +#: ../gio/gio-tool-set.c:33 +msgid "Type of the attribute" +msgstr "" + +#: ../gio/gio-tool-set.c:33 +msgid "TYPE" +msgstr "" + +#: ../gio/gio-tool-set.c:89 +msgid "ATTRIBUTE" +msgstr "" + +#: ../gio/gio-tool-set.c:89 +msgid "VALUE" +msgstr "" + +#: ../gio/gio-tool-set.c:93 +msgid "Set a file attribute of LOCATION." +msgstr "" + +#: ../gio/gio-tool-set.c:113 +#, fuzzy +#| msgid "No connection endpoint specified" +msgid "Location not specified" +msgstr "Ne konekta finpunkto specifita" + +#: ../gio/gio-tool-set.c:120 +#| msgid "Error: signal not specified.\n" +msgid "Attribute not specified" +msgstr "Atributo ne estas specifita" + +#: ../gio/gio-tool-set.c:130 +#| msgid "Error: signal not specified.\n" +msgid "Value not specified" +msgstr "Valoro ne estas specifita" + +#: ../gio/gio-tool-set.c:180 +#, c-format +#| msgid "Invalid attribute type (string expected)" +msgid "Invalid attribute type “%sâ€" +msgstr "Nevalida atributa tipo “%sâ€" + +#: ../gio/gio-tool-trash.c:32 +msgid "Empty the trash" +msgstr "" + +#: ../gio/gio-tool-trash.c:86 +msgid "Move files or directories to the trash." +msgstr "" + +#: ../gio/gio-tool-tree.c:33 +msgid "Follow symbolic links, mounts and shortcuts" +msgstr "" + +#: ../gio/gio-tool-tree.c:244 +msgid "List contents of directories in a tree-like format." +msgstr "" + +#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1492 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "Elemento <%s> ne estas permesita interne de <%s>" -#: ../gio/glib-compile-resources.c:148 ../gio/glib-compile-schemas.c:1453 +#: ../gio/glib-compile-resources.c:146 #, c-format msgid "Element <%s> not allowed at toplevel" msgstr "Elemento <%s> ne estas permesita je plejsupre nivelo" -#: ../gio/glib-compile-resources.c:235 +#: ../gio/glib-compile-resources.c:237 #, c-format msgid "File %s appears multiple times in the resource" msgstr "" #: ../gio/glib-compile-resources.c:248 -#, c-format -msgid "Failed to locate '%s' in any source directory" -msgstr "" +#, fuzzy, c-format +#| msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s†in any source directory" +msgstr "Malsukcesis trovi na “%s†en fonta dosierujo" #: ../gio/glib-compile-resources.c:259 -#, c-format -#| msgid "Failed to change to directory '%s' (%s)" -msgid "Failed to locate '%s' in current directory" -msgstr "Malsukcesis trovi na '%s' en aktuala dosierujo" +#, fuzzy, c-format +#| msgid "Failed to locate '%s' in current directory" +msgid "Failed to locate “%s†in current directory" +msgstr "Malsukcesis trovi na “%s†en aktuala dosierujo" -#: ../gio/glib-compile-resources.c:287 -#, c-format -msgid "Unknown processing option \"%s\"" -msgstr "Nekonata opcio de traktado \"%s\"" +#: ../gio/glib-compile-resources.c:290 +#, fuzzy, c-format +#| msgid "Unknown processing option \"%s\"" +msgid "Unknown processing option “%sâ€" +msgstr "Nekonata opcio de traktado “%sâ€" -#: ../gio/glib-compile-resources.c:305 ../gio/glib-compile-resources.c:363 +#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354 #, c-format msgid "Failed to create temp file: %s" msgstr "Malsukcesis krei dosieron: %s" -#: ../gio/glib-compile-resources.c:335 -#| msgid "Error setting symlink: file is not a symlink" -msgid "Error processing input file with xmllint" -msgstr "Eraro dum traktado de enig-dosiero per 'xmllint'" - -#: ../gio/glib-compile-resources.c:390 -msgid "Error processing input file with to-pixdata" -msgstr "" - -#: ../gio/glib-compile-resources.c:403 +#: ../gio/glib-compile-resources.c:382 #, c-format msgid "Error reading file %s: %s" msgstr "Eraro dum legado de la dosiero %s: %s" -#: ../gio/glib-compile-resources.c:423 +#: ../gio/glib-compile-resources.c:402 #, c-format -#| msgid "Error opening file: %s" msgid "Error compressing file %s" msgstr "Eraro dum kompaktigo de dosiero: %s" -#: ../gio/glib-compile-resources.c:487 ../gio/glib-compile-schemas.c:1561 +#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1604 #, c-format msgid "text may not appear inside <%s>" msgstr "teksto ne povi montriÄas interne de <%s>" -#: ../gio/glib-compile-resources.c:610 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2053 +msgid "Show program version and exit" +msgstr "" + +#: ../gio/glib-compile-resources.c:665 msgid "name of the output file" msgstr "nomo de la elig-dosiero" -#: ../gio/glib-compile-resources.c:610 ../gio/glib-compile-resources.c:643 -#: ../gio/gresource-tool.c:477 ../gio/gresource-tool.c:543 -msgid "FILE" -msgstr "DOSIERO" - -#: ../gio/glib-compile-resources.c:611 +#: ../gio/glib-compile-resources.c:666 msgid "" "The directories where files are to be read from (default to current " "directory)" msgstr "" -#: ../gio/glib-compile-resources.c:611 ../gio/glib-compile-schemas.c:1989 -#: ../gio/glib-compile-schemas.c:2019 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2054 +#: ../gio/glib-compile-schemas.c:2082 msgid "DIRECTORY" msgstr "DOSIERUJO" -#: ../gio/glib-compile-resources.c:612 +#: ../gio/glib-compile-resources.c:667 msgid "" "Generate output in the format selected for by the target filename extension" msgstr "" -#: ../gio/glib-compile-resources.c:613 +#: ../gio/glib-compile-resources.c:668 msgid "Generate source header" msgstr "" -#: ../gio/glib-compile-resources.c:614 +#: ../gio/glib-compile-resources.c:669 msgid "Generate sourcecode used to link in the resource file into your code" msgstr "" -#: ../gio/glib-compile-resources.c:615 +#: ../gio/glib-compile-resources.c:670 msgid "Generate dependency list" msgstr "Generi liston de dependeco" -#: ../gio/glib-compile-resources.c:616 -msgid "Don't automatically create and register resource" +#: ../gio/glib-compile-resources.c:671 +msgid "name of the dependency file to generate" +msgstr "" + +#: ../gio/glib-compile-resources.c:672 +msgid "Include phony targets in the generated dependency file" +msgstr "" + +#: ../gio/glib-compile-resources.c:673 +#, fuzzy +#| msgid "Don't automatically create and register resource" +msgid "Don’t automatically create and register resource" msgstr "Ne aÅtomate generi aÅ registri risurcon" -#: ../gio/glib-compile-resources.c:617 +#: ../gio/glib-compile-resources.c:674 +msgid "Don’t export functions; declare them G_GNUC_INTERNAL" +msgstr "" + +#: ../gio/glib-compile-resources.c:675 msgid "C identifier name used for the generated source code" msgstr "" -#: ../gio/glib-compile-resources.c:646 -#| msgid "" -#| "Compile all GSettings schema files into a schema cache.\n" -#| "Schema files are required to have the extension .gschema.xml,\n" -#| "and the cache file is called gschemas.compiled." +#: ../gio/glib-compile-resources.c:701 msgid "" "Compile a resource specification into a resource file.\n" "Resource specification files have the extension .gresource.xml,\n" @@ -1304,59 +2515,64 @@ msgstr "" "Risurca specifiga dosiero havas la sufikson .gresource.xml,\n" "kaj la risurca dosiero estas nomita .gresource." -#: ../gio/glib-compile-resources.c:662 +#: ../gio/glib-compile-resources.c:723 #, c-format msgid "You should give exactly one file name\n" msgstr "Vi devus doni precize unu dosieran nomon\n" -#: ../gio/glib-compile-schemas.c:774 +#: ../gio/glib-compile-schemas.c:784 msgid "empty names are not permitted" -msgstr "Malplenaj nomoj ne estas permesataj" +msgstr "malplenaj nomoj ne estas permesataj" -#: ../gio/glib-compile-schemas.c:784 +#: ../gio/glib-compile-schemas.c:794 #, c-format msgid "invalid name '%s': names must begin with a lowercase letter" msgstr "nevalida nomo '%s': nomoj devas komenciÄi per minusklo" -#: ../gio/glib-compile-schemas.c:796 -#, c-format +#: ../gio/glib-compile-schemas.c:806 +#, fuzzy, c-format +#| msgid "" +#| "invalid name '%s': invalid character '%c'; only lowercase letters, " +#| "numbers and dash ('-') are permitted." msgid "" "invalid name '%s': invalid character '%c'; only lowercase letters, numbers " -"and dash ('-') are permitted." +"and hyphen ('-') are permitted." msgstr "" "nevalida nomo '%s: nevalida karaktro '%c'; nur minuskloj, nombroj kaj " "streketo ('-') permesataj." -#: ../gio/glib-compile-schemas.c:805 -#, c-format -msgid "invalid name '%s': two successive dashes ('--') are not permitted." +#: ../gio/glib-compile-schemas.c:815 +#, fuzzy, c-format +#| msgid "invalid name '%s': two successive dashes ('--') are not permitted." +msgid "invalid name '%s': two successive hyphens ('--') are not permitted." msgstr "nevalida nomo '%s': du sinsekvaj streketoj ('--') ne permesataj." -#: ../gio/glib-compile-schemas.c:814 -#, c-format -msgid "invalid name '%s': the last character may not be a dash ('-')." +#: ../gio/glib-compile-schemas.c:824 +#, fuzzy, c-format +#| msgid "invalid name '%s': the last character may not be a dash ('-')." +msgid "invalid name '%s': the last character may not be a hyphen ('-')." msgstr "nevalida nomo '%s': la fina karaktro ne povas esti streketo ('-')." -#: ../gio/glib-compile-schemas.c:822 +#: ../gio/glib-compile-schemas.c:832 #, c-format msgid "invalid name '%s': maximum length is 1024" msgstr "nevalida nomo '%s': maksimuma longeco estas 1024" -#: ../gio/glib-compile-schemas.c:891 +#: ../gio/glib-compile-schemas.c:902 #, c-format msgid "<child name='%s'> already specified" -msgstr "<child name='%s> jam specifita" +msgstr "<child name='%s'> jam specifita" -#: ../gio/glib-compile-schemas.c:917 +#: ../gio/glib-compile-schemas.c:928 msgid "cannot add keys to a 'list-of' schema" msgstr "ne eblas aldoni Ålosilojn al skemo 'list-of'" -#: ../gio/glib-compile-schemas.c:928 +#: ../gio/glib-compile-schemas.c:939 #, c-format msgid "<key name='%s'> already specified" -msgstr "<key name='%s> jam specifita" +msgstr "<key name='%s'> jam specifita" -#: ../gio/glib-compile-schemas.c:946 +#: ../gio/glib-compile-schemas.c:957 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " @@ -1365,72 +2581,72 @@ msgstr "" "<key name='%s'> kaÅas <key name='%s'> en <schema id='%s'>; uzu <override> " "por modifi valoron" -#: ../gio/glib-compile-schemas.c:957 +#: ../gio/glib-compile-schemas.c:968 #, c-format msgid "" "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute " "to <key>" msgstr "" -"Precize unu el 'type', 'enum' aÅ 'flags' devas esti specifita kiel atributo " +"precize unu el 'type', 'enum' aÅ 'flags' devas esti specifita kiel atributo " "de <key>" -#: ../gio/glib-compile-schemas.c:976 +#: ../gio/glib-compile-schemas.c:987 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "<%s id='%s'> ne (jam) difinita." -#: ../gio/glib-compile-schemas.c:991 +#: ../gio/glib-compile-schemas.c:1002 #, c-format msgid "invalid GVariant type string '%s'" -msgstr "Nevalida GVariant tipo-ĉeno '%s'" +msgstr "nevalida GVariant tipo-ĉeno '%s'" -#: ../gio/glib-compile-schemas.c:1021 +#: ../gio/glib-compile-schemas.c:1032 msgid "<override> given but schema isn't extending anything" msgstr "<override> donita sed skemo ne etendanta io" -#: ../gio/glib-compile-schemas.c:1034 +#: ../gio/glib-compile-schemas.c:1045 #, c-format msgid "no <key name='%s'> to override" msgstr "neniu <key name='%s'> por superregi" -#: ../gio/glib-compile-schemas.c:1042 +#: ../gio/glib-compile-schemas.c:1053 #, c-format msgid "<override name='%s'> already specified" -msgstr "<override name='%s> jam specifita" +msgstr "<override name='%s'> jam specifita" -#: ../gio/glib-compile-schemas.c:1113 +#: ../gio/glib-compile-schemas.c:1126 #, c-format msgid "<schema id='%s'> already specified" msgstr "<schema id='%s'> jam specifita" -#: ../gio/glib-compile-schemas.c:1125 +#: ../gio/glib-compile-schemas.c:1138 #, c-format msgid "<schema id='%s'> extends not yet existing schema '%s'" msgstr "<schema id='%s'> etendas skemo '%s' kiu ankoraÅ ne ekzistas" -#: ../gio/glib-compile-schemas.c:1141 +#: ../gio/glib-compile-schemas.c:1154 #, c-format msgid "<schema id='%s'> is list of not yet existing schema '%s'" msgstr "<schema id='%s'> estas listo de skemo '%s' kiu ankoraÅ ne ekzistas" -#: ../gio/glib-compile-schemas.c:1149 +#: ../gio/glib-compile-schemas.c:1162 #, c-format msgid "Can not be a list of a schema with a path" msgstr "Ne eblas esti listo de skemo kun vojo" -#: ../gio/glib-compile-schemas.c:1159 +#: ../gio/glib-compile-schemas.c:1172 #, c-format msgid "Can not extend a schema with a path" msgstr "Ne eblas etendi liston de skemo kun vojo" -#: ../gio/glib-compile-schemas.c:1169 +#: ../gio/glib-compile-schemas.c:1182 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" "<schema id='%s'> estas listo, etendanta <schema id='%s'> kiu ne estas listo" -#: ../gio/glib-compile-schemas.c:1179 +#: ../gio/glib-compile-schemas.c:1192 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' " @@ -1439,81 +2655,98 @@ msgstr "" "<schema id='%s' list-of='%s'> etendas <schema id='%s' list-of='%s'> sed '%s' " "ne etendas '%s'" -#: ../gio/glib-compile-schemas.c:1196 +#: ../gio/glib-compile-schemas.c:1209 #, c-format msgid "a path, if given, must begin and end with a slash" msgstr "vojo, se donita, devas komenciÄi kaj finiÄi kun oblikvo" -#: ../gio/glib-compile-schemas.c:1203 +#: ../gio/glib-compile-schemas.c:1216 #, c-format msgid "the path of a list must end with ':/'" msgstr "la vojo de listo devas finiÄi en ':/'" -#: ../gio/glib-compile-schemas.c:1229 +#: ../gio/glib-compile-schemas.c:1248 #, c-format msgid "<%s id='%s'> already specified" msgstr "<%s id='%s'> jam specifita" +#: ../gio/glib-compile-schemas.c:1398 ../gio/glib-compile-schemas.c:1414 +#, c-format +#| msgid "Element <%s> not allowed inside <%s>" +msgid "Only one <%s> element allowed inside <%s>" +msgstr "Elemento <%s> ne estas permesata ene de <%s>" + +#: ../gio/glib-compile-schemas.c:1496 +#, c-format +#| msgid "Element <%s> not allowed at toplevel" +msgid "Element <%s> not allowed at the top level" +msgstr "Elemento <%s> ne estas permesata je plejsupra nivelo" + #. Translators: Do not translate "--strict". -#: ../gio/glib-compile-schemas.c:1747 ../gio/glib-compile-schemas.c:1818 -#: ../gio/glib-compile-schemas.c:1894 +#: ../gio/glib-compile-schemas.c:1806 ../gio/glib-compile-schemas.c:1880 +#: ../gio/glib-compile-schemas.c:1956 #, c-format msgid "--strict was specified; exiting.\n" msgstr "--strict estis specifita; eliranta.\n" -#: ../gio/glib-compile-schemas.c:1755 +#: ../gio/glib-compile-schemas.c:1816 #, c-format msgid "This entire file has been ignored.\n" -msgstr "Ĉi tiu tuta dosiero estas ignorita. \n" +msgstr "Ĉi tiu tuta dosiero estas ignorita.\n" -#: ../gio/glib-compile-schemas.c:1814 +#: ../gio/glib-compile-schemas.c:1876 #, c-format msgid "Ignoring this file.\n" msgstr "Ignoras ĉi tiun dosieron.\n" -#: ../gio/glib-compile-schemas.c:1854 +#: ../gio/glib-compile-schemas.c:1916 #, c-format msgid "No such key '%s' in schema '%s' as specified in override file '%s'" msgstr "" "Neniu tia Ålosilo '%s' en skemo '%s' kiel estas specifite en superrego-" "dosiero '%s'" -#: ../gio/glib-compile-schemas.c:1860 ../gio/glib-compile-schemas.c:1918 -#: ../gio/glib-compile-schemas.c:1946 +#: ../gio/glib-compile-schemas.c:1922 ../gio/glib-compile-schemas.c:1980 +#: ../gio/glib-compile-schemas.c:2008 #, c-format msgid "; ignoring override for this key.\n" msgstr "; ignoras superrego por ĉi tiu Ålosilo.\n" -#: ../gio/glib-compile-schemas.c:1864 ../gio/glib-compile-schemas.c:1922 -#: ../gio/glib-compile-schemas.c:1950 +#: ../gio/glib-compile-schemas.c:1926 ../gio/glib-compile-schemas.c:1984 +#: ../gio/glib-compile-schemas.c:2012 #, c-format msgid " and --strict was specified; exiting.\n" msgstr " kaj --strict estis specifita; eliranta.\n" -#: ../gio/glib-compile-schemas.c:1880 -#, c-format +#: ../gio/glib-compile-schemas.c:1942 +#, fuzzy, c-format +#| msgid "" +#| "error parsing key '%s' in schema '%s' as specified in override file '%s': " +#| "%s. " msgid "" -"error parsing key '%s' in schema '%s' as specified in override file '%s': " -"%s. " +"error parsing key '%s' in schema '%s' as specified in override file '%s': %s." msgstr "" -"Eraro dum sintaksa analizo de la Ålosilo '%s' en skemo '%s' kiel estas " +"eraro dum sintaksa analizo de la Ålosilo '%s' en skemo '%s' kiel estas " "specifita en superrego-dosiero '%s': %s." -#: ../gio/glib-compile-schemas.c:1890 +#: ../gio/glib-compile-schemas.c:1952 #, c-format msgid "Ignoring override for this key.\n" msgstr "Ignoras superregon por ĉi tiu Ålosilo.\n" -#: ../gio/glib-compile-schemas.c:1908 -#, c-format +#: ../gio/glib-compile-schemas.c:1970 +#, fuzzy, c-format +#| msgid "" +#| "override for key '%s' in schema '%s' in override file '%s' is out of the " +#| "range given in the schema" msgid "" -"override for key '%s' in schema '%s' in override file '%s' is out of the " +"override for key '%s' in schema '%s' in override file '%s' is outside the " "range given in the schema" msgstr "" "superrego por Ålosilo '%s' en skemo '%s' en superrego-dosiero '%s' ne estas " "en la intervalo donita en la skemo" -#: ../gio/glib-compile-schemas.c:1936 +#: ../gio/glib-compile-schemas.c:1998 #, c-format msgid "" "override for key '%s' in schema '%s' in override file '%s' is not in the " @@ -1522,23 +2755,23 @@ msgstr "" "superrego por Ålosilo '%s' en skemo '%s' en superrego-dosiero '%s' ne estas " "en la listo de la validaj elektoj" -#: ../gio/glib-compile-schemas.c:1989 +#: ../gio/glib-compile-schemas.c:2054 msgid "where to store the gschemas.compiled file" msgstr "kie enmemorigi la gschema.compiled dosieron" -#: ../gio/glib-compile-schemas.c:1990 +#: ../gio/glib-compile-schemas.c:2055 msgid "Abort on any errors in schemas" msgstr "Ĉesigi se iuj eraroj en skemoj" -#: ../gio/glib-compile-schemas.c:1991 +#: ../gio/glib-compile-schemas.c:2056 msgid "Do not write the gschema.compiled file" msgstr "Ne verki na la gschema.compiled dosieron" -#: ../gio/glib-compile-schemas.c:1992 +#: ../gio/glib-compile-schemas.c:2057 msgid "Do not enforce key name restrictions" msgstr "Ne devigi Ålosilonomajn limigojn" -#: ../gio/glib-compile-schemas.c:2022 +#: ../gio/glib-compile-schemas.c:2085 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" @@ -1548,333 +2781,372 @@ msgstr "" "Skemaj dosieroj estas bezonas havi la sufikson .gschema.xml,\n" "kaj la kaÅmemora dosiero estas nomita gschemas.compiled." -#: ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2106 #, c-format msgid "You should give exactly one directory name\n" msgstr "Vi devus doni precize unu dosierujan nomon\n" -#: ../gio/glib-compile-schemas.c:2077 +#: ../gio/glib-compile-schemas.c:2148 #, c-format msgid "No schema files found: " -msgstr "Neniuj skemaj dosieroj trovitaj:" +msgstr "Neniuj skemaj dosieroj trovitaj: " -#: ../gio/glib-compile-schemas.c:2080 +#: ../gio/glib-compile-schemas.c:2151 #, c-format msgid "doing nothing.\n" msgstr "faranta nenion.\n" -#: ../gio/glib-compile-schemas.c:2083 +#: ../gio/glib-compile-schemas.c:2154 #, c-format msgid "removed existing output file.\n" -msgstr "Forigis ekzistantan eliran dosieron.\n" - -#: ../gio/glocaldirectorymonitor.c:287 -msgid "Unable to find default local directory monitor type" -msgstr "Ne eblas trovi defaÅltan tipon de loka dosieruja kontrolado" +msgstr "forigis ekzistantan eliran dosieron.\n" -#: ../gio/glocalfile.c:571 ../gio/win32/gwinhttpfile.c:422 +#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420 #, c-format msgid "Invalid filename %s" msgstr "Nevalida dosiernomo %s" -#: ../gio/glocalfile.c:948 -#, c-format -msgid "Error getting filesystem info: %s" -msgstr "Eraro dum akiro de dosiersistema informo: %s" +#: ../gio/glocalfile.c:1037 +#, fuzzy, c-format +#| msgid "Error getting filesystem info: %s" +msgid "Error getting filesystem info for %s: %s" +msgstr "Eraro dum akiro de dosiersistema informo %s: %s" -#: ../gio/glocalfile.c:1116 -msgid "Can't rename root directory" +#. Translators: This is an error message when trying to find +#. * the enclosing (user visible) mount of a file, but none +#. * exists. +#. +#: ../gio/glocalfile.c:1176 +#, fuzzy, c-format +#| msgid "Containing mount does not exist" +msgid "Containing mount for file %s not found" +msgstr "Enhavantan munton por dosiero %s ne trovis" + +#: ../gio/glocalfile.c:1199 +#, fuzzy +#| msgid "Can't rename root directory" +msgid "Can’t rename root directory" msgstr "Ne eblas alinomi radikan dosierujon" -#: ../gio/glocalfile.c:1136 ../gio/glocalfile.c:1162 -#, c-format -msgid "Error renaming file: %s" -msgstr "Eraro dum alinomo de la dosiero: %s" +#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240 +#, fuzzy, c-format +#| msgid "Error reading file %s: %s" +msgid "Error renaming file %s: %s" +msgstr "Eraro dum legado de la dosiero %s: %s" -#: ../gio/glocalfile.c:1145 -msgid "Can't rename file, filename already exists" +#: ../gio/glocalfile.c:1224 +#, fuzzy +#| msgid "Can't rename file, filename already exists" +msgid "Can’t rename file, filename already exists" msgstr "Ne eblas alinomi dosieron, dosiernomo jam ekzistas" -#: ../gio/glocalfile.c:1158 ../gio/glocalfile.c:2162 ../gio/glocalfile.c:2191 -#: ../gio/glocalfile.c:2351 ../gio/glocalfileoutputstream.c:581 -#: ../gio/glocalfileoutputstream.c:634 ../gio/glocalfileoutputstream.c:679 -#: ../gio/glocalfileoutputstream.c:1167 +#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2251 ../gio/glocalfile.c:2279 +#: ../gio/glocalfile.c:2436 ../gio/glocalfileoutputstream.c:549 msgid "Invalid filename" msgstr "Nevalida dosiernomo" -#: ../gio/glocalfile.c:1325 ../gio/glocalfile.c:1349 -msgid "Can't open directory" -msgstr "Ne eblas malfermi dosierujon" - -#: ../gio/glocalfile.c:1333 -#, c-format -msgid "Error opening file: %s" -msgstr "Eraro dum malfermo de la dosiero: %s" +#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419 +#, fuzzy, c-format +#| msgid "Error opening file '%s': %s" +msgid "Error opening file %s: %s" +msgstr "Eraro dum malfermo de la dosiero '%s': %s" -#: ../gio/glocalfile.c:1474 +#: ../gio/glocalfile.c:1544 #, c-format -msgid "Error removing file: %s" -msgstr "Eraro dum forigo de la dosiero: %s" +#| msgid "Error removing file: %s" +msgid "Error removing file %s: %s" +msgstr "Eraro dum forigo de la dosiero %s: %s" -#: ../gio/glocalfile.c:1841 +#: ../gio/glocalfile.c:1927 #, c-format -msgid "Error trashing file: %s" -msgstr "Eraro dum forÅovo de la dosiero: %s al la rubujo" +#| msgid "Error trashing file: %s" +msgid "Error trashing file %s: %s" +msgstr "Eraro dum forigo de la dosiero %s: %s" -#: ../gio/glocalfile.c:1864 +#: ../gio/glocalfile.c:1950 #, c-format msgid "Unable to create trash dir %s: %s" msgstr "Ne eblas krei rubujan dosierujon %s: %s" -#: ../gio/glocalfile.c:1885 -msgid "Unable to find toplevel directory for trash" -msgstr "Ne eblas trovi plejsupra-nivelan dosierujon por rubujo" - -#: ../gio/glocalfile.c:1964 ../gio/glocalfile.c:1984 -msgid "Unable to find or create trash directory" -msgstr "Ne eblas trovi aÅ krei rubujan dosierujon" +#: ../gio/glocalfile.c:1970 +#, fuzzy, c-format +#| msgid "Unable to find toplevel directory for trash" +msgid "Unable to find toplevel directory to trash %s" +msgstr "Ne eblas trovi plejsupra-nivelan dosierujon por rubujo %s" + +#: ../gio/glocalfile.c:2049 ../gio/glocalfile.c:2069 +#, fuzzy, c-format +#| msgid "Unable to find or create trash directory" +msgid "Unable to find or create trash directory for %s" +msgstr "Ne eblas trovi aÅ krei rubujan dosierujon %s" + +#: ../gio/glocalfile.c:2103 +#, fuzzy, c-format +#| msgid "Unable to create trashing info file: %s" +msgid "Unable to create trashing info file for %s: %s" +msgstr "Ne eblas krei trashinfo-dosieron %s: %s" + +#: ../gio/glocalfile.c:2162 +#, fuzzy, c-format +#| msgid "Unable to trash file: %s" +msgid "Unable to trash file %s across filesystem boundaries" +msgstr "Ne eblas forÅovi dosieron %s al rubujo" -#: ../gio/glocalfile.c:2018 +#: ../gio/glocalfile.c:2166 ../gio/glocalfile.c:2222 #, c-format -msgid "Unable to create trashing info file: %s" -msgstr "Ne eblas krei trashinfo-dosieron: %s" +#| msgid "Unable to trash file: %s" +msgid "Unable to trash file %s: %s" +msgstr "Ne eblas forigi dosieron %s: %s" -#: ../gio/glocalfile.c:2047 ../gio/glocalfile.c:2052 ../gio/glocalfile.c:2132 -#: ../gio/glocalfile.c:2139 -#, c-format -msgid "Unable to trash file: %s" +#: ../gio/glocalfile.c:2228 +#, fuzzy, c-format +#| msgid "Unable to trash file: %s" +msgid "Unable to trash file %s" msgstr "Ne eblas forÅovi dosieron %s al rubujo" -#: ../gio/glocalfile.c:2140 ../glib/gregex.c:213 -msgid "internal error" -msgstr "interna eraro" - -#: ../gio/glocalfile.c:2166 -#, c-format -msgid "Error creating directory: %s" -msgstr "Eraro dum kreo de la dosierujo: %s" +#: ../gio/glocalfile.c:2254 +#, fuzzy, c-format +#| msgid "Error creating directory '%s': %s" +msgid "Error creating directory %s: %s" +msgstr "Eraro dum kreo de la dosierujo '%s': %s" -#: ../gio/glocalfile.c:2195 +#: ../gio/glocalfile.c:2283 #, c-format msgid "Filesystem does not support symbolic links" msgstr "Dosiersistemo ne subtenas simbolajn ligilojn" -#: ../gio/glocalfile.c:2199 +#: ../gio/glocalfile.c:2286 #, c-format -msgid "Error making symbolic link: %s" -msgstr "Eraro dum kreo de la simbola ligilo: %s" +#| msgid "Error making symbolic link: %s" +msgid "Error making symbolic link %s: %s" +msgstr "Eraro dum kreo de la simbola ligilo %s: %s" + +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2077 +msgid "Symbolic links not supported" +msgstr "Simbolaj ligiloj ne estas subtenataj" -#: ../gio/glocalfile.c:2261 ../gio/glocalfile.c:2355 +#: ../gio/glocalfile.c:2347 ../gio/glocalfile.c:2382 ../gio/glocalfile.c:2439 #, c-format -msgid "Error moving file: %s" -msgstr "Eraro dum movado de la dosiero: %s" +#| msgid "Error moving file: %s" +msgid "Error moving file %s: %s" +msgstr "Eraro dum movado de la dosiero %s: %s" -#: ../gio/glocalfile.c:2284 -msgid "Can't move directory over directory" +#: ../gio/glocalfile.c:2370 +#, fuzzy +#| msgid "Can't move directory over directory" +msgid "Can’t move directory over directory" msgstr "Ne eblas movi dosierujon super dosierujo" -#: ../gio/glocalfile.c:2311 ../gio/glocalfileoutputstream.c:965 -#: ../gio/glocalfileoutputstream.c:979 ../gio/glocalfileoutputstream.c:994 -#: ../gio/glocalfileoutputstream.c:1010 ../gio/glocalfileoutputstream.c:1024 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 +#: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 +#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 msgid "Backup file creation failed" msgstr "Sekurkopia kreado malsukcesis" -#: ../gio/glocalfile.c:2330 +#: ../gio/glocalfile.c:2415 #, c-format msgid "Error removing target file: %s" msgstr "Eraro dum forigo de la celdosiero: %s" -#: ../gio/glocalfile.c:2344 +#: ../gio/glocalfile.c:2429 msgid "Move between mounts not supported" msgstr "Movo inter muntoj ne estas subtenata" -#: ../gio/glocalfileinfo.c:719 +#: ../gio/glocalfile.c:2620 +#, fuzzy, c-format +#| msgid "could not get remote address: %s" +msgid "Could not determine the disk usage of %s: %s" +msgstr "Ne eblas akiri foran adreson %s: %s" + +#: ../gio/glocalfileinfo.c:721 msgid "Attribute value must be non-NULL" msgstr "Atributa valoro devas ne esti NUL-a" -#: ../gio/glocalfileinfo.c:726 +#: ../gio/glocalfileinfo.c:728 msgid "Invalid attribute type (string expected)" msgstr "Nevalida atributa tipo (ĉeno atendata)" -#: ../gio/glocalfileinfo.c:733 +#: ../gio/glocalfileinfo.c:735 msgid "Invalid extended attribute name" msgstr "Nevalida etendita atributnomo" -#: ../gio/glocalfileinfo.c:773 -#, c-format -msgid "Error setting extended attribute '%s': %s" -msgstr "Eraro dum agordado de la etendita atributo '%s': %s" +#: ../gio/glocalfileinfo.c:775 +#, fuzzy, c-format +#| msgid "Error setting extended attribute '%s': %s" +msgid "Error setting extended attribute “%sâ€: %s" +msgstr "Eraro dum agordado de la etendita atributo “%sâ€: %s" -#: ../gio/glocalfileinfo.c:1426 +#: ../gio/glocalfileinfo.c:1575 msgid " (invalid encoding)" msgstr " (nevalida kodoprezento)" -#: ../gio/glocalfileinfo.c:1527 ../gio/glocalfileoutputstream.c:843 -#, c-format -msgid "Error when getting information for file '%s': %s" -msgstr "Eraro dum akiro de informo de dosiero '%s': %s" +#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 +#, fuzzy, c-format +#| msgid "Error when getting information for file '%s': %s" +msgid "Error when getting information for file “%sâ€: %s" +msgstr "Eraro dum akiro de informo de dosiero “%sâ€: %s" -#: ../gio/glocalfileinfo.c:1779 +#: ../gio/glocalfileinfo.c:2017 #, c-format msgid "Error when getting information for file descriptor: %s" msgstr "Eraro dum akiro informo pri dosierpriskribilo: %s" -#: ../gio/glocalfileinfo.c:1824 +#: ../gio/glocalfileinfo.c:2062 msgid "Invalid attribute type (uint32 expected)" msgstr "Nevalida atributa tipo (uint32 atendata)" -#: ../gio/glocalfileinfo.c:1842 +#: ../gio/glocalfileinfo.c:2080 msgid "Invalid attribute type (uint64 expected)" msgstr "Nevalida atributa tipo (uint64 atendata)" -#: ../gio/glocalfileinfo.c:1861 ../gio/glocalfileinfo.c:1880 +#: ../gio/glocalfileinfo.c:2099 ../gio/glocalfileinfo.c:2118 msgid "Invalid attribute type (byte string expected)" msgstr "Nevalida atributa tipo (bajta ĉeno atendata)" -#: ../gio/glocalfileinfo.c:1915 +#: ../gio/glocalfileinfo.c:2153 msgid "Cannot set permissions on symlinks" -msgstr "Ne eblas agordi permesojn sur simbolaj ligiloj " +msgstr "Ne eblas agordi permesojn sur simbolaj ligiloj" -#: ../gio/glocalfileinfo.c:1931 +#: ../gio/glocalfileinfo.c:2169 #, c-format msgid "Error setting permissions: %s" msgstr "Eraro dum agordado de la permesoj: %s" -#: ../gio/glocalfileinfo.c:1982 +#: ../gio/glocalfileinfo.c:2220 #, c-format msgid "Error setting owner: %s" msgstr "Eraro dum agordado de posedanto: %s" -#: ../gio/glocalfileinfo.c:2005 +#: ../gio/glocalfileinfo.c:2243 msgid "symlink must be non-NULL" msgstr "simligilo devas ne esti NUL-a" -#: ../gio/glocalfileinfo.c:2015 ../gio/glocalfileinfo.c:2034 -#: ../gio/glocalfileinfo.c:2045 +#: ../gio/glocalfileinfo.c:2253 ../gio/glocalfileinfo.c:2272 +#: ../gio/glocalfileinfo.c:2283 #, c-format msgid "Error setting symlink: %s" msgstr "Eraro dum agordado de simligilo: %s" -#: ../gio/glocalfileinfo.c:2024 +#: ../gio/glocalfileinfo.c:2262 msgid "Error setting symlink: file is not a symlink" msgstr "Eraro dum agordado de simligilo: dosiero ne estas simligilo" -#: ../gio/glocalfileinfo.c:2150 +#: ../gio/glocalfileinfo.c:2388 #, c-format msgid "Error setting modification or access time: %s" msgstr "Eraro dum agordado de modifaĵo aÅ alira horo: %s" -#: ../gio/glocalfileinfo.c:2173 +#: ../gio/glocalfileinfo.c:2411 msgid "SELinux context must be non-NULL" -msgstr "SELinuksa kunteksto devas ne esti NUL-a " +msgstr "SELinuksa kunteksto devas ne esti NUL-a" -#: ../gio/glocalfileinfo.c:2188 +#: ../gio/glocalfileinfo.c:2426 #, c-format msgid "Error setting SELinux context: %s" msgstr "Eraro dum agordado de la SELinuksa kunteksto: %s" -#: ../gio/glocalfileinfo.c:2195 +#: ../gio/glocalfileinfo.c:2433 msgid "SELinux is not enabled on this system" -msgstr "\"SELinux\" ne estas enÅaltita sur ĉi tiu sistemo" +msgstr "SELinux ne estas enÅaltita sur ĉi tiu sistemo" -#: ../gio/glocalfileinfo.c:2287 +#: ../gio/glocalfileinfo.c:2525 #, c-format msgid "Setting attribute %s not supported" msgstr "Agordi atributon %s ne subtenita" -#: ../gio/glocalfileinputstream.c:185 ../gio/glocalfileoutputstream.c:732 +#: ../gio/glocalfileinputstream.c:168 ../gio/glocalfileoutputstream.c:694 #, c-format msgid "Error reading from file: %s" msgstr "Eraro dum legado de la dosiero: %s" -#: ../gio/glocalfileinputstream.c:216 ../gio/glocalfileinputstream.c:228 -#: ../gio/glocalfileinputstream.c:340 ../gio/glocalfileoutputstream.c:470 -#: ../gio/glocalfileoutputstream.c:1042 +#: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211 +#: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333 +#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003 #, c-format msgid "Error seeking in file: %s" msgstr "Eraro dum serĉo en la dosiero: %s" -#: ../gio/glocalfileinputstream.c:261 ../gio/glocalfileoutputstream.c:256 -#: ../gio/glocalfileoutputstream.c:351 +#: ../gio/glocalfileinputstream.c:255 ../gio/glocalfileoutputstream.c:246 +#: ../gio/glocalfileoutputstream.c:340 #, c-format msgid "Error closing file: %s" msgstr "Eraro dum fermado de la dosiero: %s" -#: ../gio/glocalfilemonitor.c:212 +#: ../gio/glocalfilemonitor.c:840 msgid "Unable to find default local file monitor type" msgstr "Ne eblas trovi defaÅltan tipon de loka dosiera monitoro" -#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:235 -#: ../gio/glocalfileoutputstream.c:753 +#: ../gio/glocalfileoutputstream.c:194 ../gio/glocalfileoutputstream.c:226 +#: ../gio/glocalfileoutputstream.c:715 #, c-format msgid "Error writing to file: %s" msgstr "Eraro dum skribado de la dosiero: %s" -#: ../gio/glocalfileoutputstream.c:283 +#: ../gio/glocalfileoutputstream.c:273 #, c-format msgid "Error removing old backup link: %s" msgstr "Eraro dum forigo de la malnova sekurkopia ligilo: %s" -#: ../gio/glocalfileoutputstream.c:297 ../gio/glocalfileoutputstream.c:310 +#: ../gio/glocalfileoutputstream.c:287 ../gio/glocalfileoutputstream.c:300 #, c-format msgid "Error creating backup copy: %s" msgstr "Eraro dum kreado de sekurkopio: %s" -#: ../gio/glocalfileoutputstream.c:328 +#: ../gio/glocalfileoutputstream.c:318 #, c-format msgid "Error renaming temporary file: %s" msgstr "Eraro dum alinomo de la provizora dosiero: %s" -#: ../gio/glocalfileoutputstream.c:516 ../gio/glocalfileoutputstream.c:1093 +#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054 #, c-format msgid "Error truncating file: %s" msgstr "Eraro dum trunko de la dosiero: %s" -#: ../gio/glocalfileoutputstream.c:587 ../gio/glocalfileoutputstream.c:640 -#: ../gio/glocalfileoutputstream.c:685 ../gio/glocalfileoutputstream.c:825 -#: ../gio/glocalfileoutputstream.c:1074 ../gio/glocalfileoutputstream.c:1173 -#, c-format -msgid "Error opening file '%s': %s" -msgstr "Eraro dum malfermo de la dosiero '%s': %s" +#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 +#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 +#, fuzzy, c-format +#| msgid "Error opening file '%s': %s" +msgid "Error opening file “%sâ€: %s" +msgstr "Eraro dum malfermo de la dosiero “%sâ€: %s" -#: ../gio/glocalfileoutputstream.c:856 +#: ../gio/glocalfileoutputstream.c:816 msgid "Target file is a directory" msgstr "Celdosiero estas dosierujo" -#: ../gio/glocalfileoutputstream.c:861 +#: ../gio/glocalfileoutputstream.c:821 msgid "Target file is not a regular file" msgstr "Celdosiero ne estas regula dosiero" -#: ../gio/glocalfileoutputstream.c:873 +#: ../gio/glocalfileoutputstream.c:833 msgid "The file was externally modified" msgstr "La dosiero estis ekstere modifita" -#: ../gio/glocalfileoutputstream.c:1058 +#: ../gio/glocalfileoutputstream.c:1019 #, c-format msgid "Error removing old file: %s" msgstr "Eraro dum forigo de la malnova dosiero: %s" -#: ../gio/gmemoryinputstream.c:492 ../gio/gmemoryoutputstream.c:750 +#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772 msgid "Invalid GSeekType supplied" msgstr "Nevalida GSeekType liverita" -#: ../gio/gmemoryinputstream.c:502 +#: ../gio/gmemoryinputstream.c:484 msgid "Invalid seek request" msgstr "Nevalida serĉpeto" -#: ../gio/gmemoryinputstream.c:526 +#: ../gio/gmemoryinputstream.c:508 msgid "Cannot truncate GMemoryInputStream" msgstr "Ne eblas trunki GMemoryInputStream-on" -#: ../gio/gmemoryoutputstream.c:496 +#: ../gio/gmemoryoutputstream.c:567 msgid "Memory output stream not resizable" msgstr "Grando de memoro-eliga fluo ne estas ÅanÄebla" -#: ../gio/gmemoryoutputstream.c:512 +#: ../gio/gmemoryoutputstream.c:583 msgid "Failed to resize memory output stream" msgstr "Malsuksesis ÅanÄi la grandon de memoro-eliga fluo" -#: ../gio/gmemoryoutputstream.c:600 +#: ../gio/gmemoryoutputstream.c:673 msgid "" "Amount of memory required to process the write is larger than available " "address space" @@ -1882,179 +3154,175 @@ msgstr "" "Sumo de memoro kiu estas bezonata por trakti de la skribo estas pli granda " "ol havebla adresa spaco" -#: ../gio/gmemoryoutputstream.c:760 +#: ../gio/gmemoryoutputstream.c:782 msgid "Requested seek before the beginning of the stream" msgstr "Petita enpozicigo antaÅ la komencon de la fluo" -#: ../gio/gmemoryoutputstream.c:769 +#: ../gio/gmemoryoutputstream.c:797 msgid "Requested seek beyond the end of the stream" msgstr "Petita serĉ-loko estas preter la finon de la fluo" #. Translators: This is an error #. * message for mount objects that #. * don't implement unmount. -#: ../gio/gmount.c:363 -msgid "mount doesn't implement \"unmount\"" -msgstr "munto ne realigas \"unmount\"" +#: ../gio/gmount.c:393 +#, fuzzy +#| msgid "mount doesn't implement \"unmount\"" +msgid "mount doesn’t implement “unmountâ€" +msgstr "munto ne realigas “unmountâ€" #. Translators: This is an error #. * message for mount objects that #. * don't implement eject. -#: ../gio/gmount.c:442 -msgid "mount doesn't implement \"eject\"" -msgstr "munto ne realigas \"eject\"" +#: ../gio/gmount.c:469 +#, fuzzy +#| msgid "mount doesn't implement \"eject\"" +msgid "mount doesn’t implement “ejectâ€" +msgstr "munto ne realigas “ejectâ€" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of unmount or unmount_with_operation. -#: ../gio/gmount.c:523 -msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" -msgstr "munto ne realigas \"unmount\" aÅ \"unmount_with_operation\"" +#: ../gio/gmount.c:547 +#, fuzzy +#| msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\"" +msgid "mount doesn’t implement “unmount†or “unmount_with_operationâ€" +msgstr "munto ne realigas “unmount†aŠ“unmount_with_operationâ€" #. Translators: This is an error #. * message for mount objects that #. * don't implement any of eject or eject_with_operation. -#: ../gio/gmount.c:611 -msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" -msgstr "munto ne realigas \"eject\" aÅ \"eject_with_operation\"" +#: ../gio/gmount.c:632 +#, fuzzy +#| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\"" +msgid "mount doesn’t implement “eject†or “eject_with_operationâ€" +msgstr "munto ne realigas “eject†aŠ“eject_with_operationâ€" #. Translators: This is an error #. * message for mount objects that #. * don't implement remount. -#: ../gio/gmount.c:701 -msgid "mount doesn't implement \"remount\"" +#: ../gio/gmount.c:720 +#, fuzzy +#| msgid "mount doesn't implement \"remount\"" +msgid "mount doesn’t implement “remountâ€" msgstr "munto ne realigas \"remount\"" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. -#: ../gio/gmount.c:785 -msgid "mount doesn't implement content type guessing" +#: ../gio/gmount.c:802 +#, fuzzy +#| msgid "mount doesn't implement content type guessing" +msgid "mount doesn’t implement content type guessing" msgstr "munto ne realigas konjektanta de enhava tipo" #. Translators: This is an error #. * message for mount objects that #. * don't implement content type guessing. -#: ../gio/gmount.c:874 -msgid "mount doesn't implement synchronous content type guessing" +#: ../gio/gmount.c:889 +#, fuzzy +#| msgid "mount doesn't implement synchronous content type guessing" +msgid "mount doesn’t implement synchronous content type guessing" msgstr "munto ne realigas konjektadon pri enhava tipo sinkrone" -#: ../gio/gnetworkaddress.c:322 -#, c-format -msgid "Hostname '%s' contains '[' but not ']'" +#: ../gio/gnetworkaddress.c:378 +#, fuzzy, c-format +#| msgid "Hostname '%s' contains '[' but not ']'" +msgid "Hostname “%s†contains “[†but not “]â€" msgstr "Gastiga komputilnomo '%s' havas '[' sed ne ']'" -#: ../gio/gnetworkmonitorbase.c:178 +#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310 msgid "Network unreachable" msgstr "Loka reto estas ne kontaktebla" -#: ../gio/gnetworkmonitorbase.c:218 +#: ../gio/gnetworkmonitorbase.c:244 ../gio/gnetworkmonitorbase.c:274 msgid "Host unreachable" msgstr "" -#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109 -#: ../gio/gnetworkmonitornetlink.c:120 +#: ../gio/gnetworkmonitornetlink.c:96 ../gio/gnetworkmonitornetlink.c:108 +#: ../gio/gnetworkmonitornetlink.c:127 #, c-format -#| msgid "could not get remote address: %s" msgid "Could not create network monitor: %s" msgstr "Ne eblas krei retmonitoron: %s" -#: ../gio/gnetworkmonitornetlink.c:129 +#: ../gio/gnetworkmonitornetlink.c:117 msgid "Could not create network monitor: " -msgstr "Ne eblas krei retmonitoron:" +msgstr "Ne eblas krei retmonitoron: " -#: ../gio/gnetworkmonitornetlink.c:177 -#| msgid "could not get remote address: %s" +#: ../gio/gnetworkmonitornetlink.c:175 msgid "Could not get network status: " -msgstr "Ne eblas akiri restaton: %s" +msgstr "Ne eblas akiri restaton: " -#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:417 -msgid "Output stream doesn't implement write" +#: ../gio/gnetworkmonitornm.c:329 +#, c-format +msgid "NetworkManager version too old" +msgstr "" + +#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560 +#, fuzzy +#| msgid "Output stream doesn't implement write" +msgid "Output stream doesn’t implement write" msgstr "Eliga fluo ne realigas skribon" -#: ../gio/goutputstream.c:378 ../gio/goutputstream.c:876 +#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224 msgid "Source stream is already closed" msgstr "Fontfluo jam estas fermita" -#: ../gio/gresolver.c:764 -#, c-format -msgid "Error resolving '%s': %s" +#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116 +#: ../gio/gthreadedresolver.c:126 +#, fuzzy, c-format +#| msgid "Error resolving '%s': %s" +msgid "Error resolving “%sâ€: %s" msgstr "Eraro dum serĉo '%s': %s" -#: ../gio/gresolver.c:814 -#, c-format -msgid "Error reverse-resolving '%s': %s" -msgstr "Eraro dum inversa serĉo '%s': %s" - -#: ../gio/gresolver.c:849 ../gio/gresolver.c:928 -#, c-format -msgid "No service record for '%s'" -msgstr "Ne ekzistas servorikordo por '%s'" - -#: ../gio/gresolver.c:854 ../gio/gresolver.c:933 -#, c-format -msgid "Temporarily unable to resolve '%s'" -msgstr "Ne eblas solvi '%s' provizore" - -#: ../gio/gresolver.c:859 ../gio/gresolver.c:938 -#, c-format -msgid "Error resolving '%s'" -msgstr "Eraro dum solvado de '%s'" - -#: ../gio/gresource.c:294 ../gio/gresource.c:539 ../gio/gresource.c:556 -#: ../gio/gresource.c:679 ../gio/gresource.c:748 ../gio/gresource.c:809 -#: ../gio/gresource.c:889 ../gio/gresourcefile.c:452 -#: ../gio/gresourcefile.c:552 ../gio/gresourcefile.c:654 -#, c-format -msgid "The resource at '%s' does not exist" +#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 +#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 +#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 +#: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 +#, fuzzy, c-format +#| msgid "The resource at '%s' does not exist" +msgid "The resource at “%s†does not exist" msgstr "La risurco ĉe '%s' ne ekzistas" -#: ../gio/gresource.c:456 -#, c-format -msgid "The resource at '%s' failed to decompress" -msgstr "" +#: ../gio/gresource.c:760 +#, fuzzy, c-format +#| msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s†failed to decompress" +msgstr "La risurco ĉe '%s' ne estas dosierujo" -#: ../gio/gresourcefile.c:650 -#, c-format -#| msgid "Target file is a directory" -msgid "The resource at '%s' is not a directory" +#: ../gio/gresourcefile.c:709 +#, fuzzy, c-format +#| msgid "The resource at '%s' is not a directory" +msgid "The resource at “%s†is not a directory" msgstr "La risurco ĉe '%s' ne estas dosierujo" -#: ../gio/gresourcefile.c:858 -#| msgid "Input stream doesn't implement read" -msgid "Input stream doesn't implement seek" +#: ../gio/gresourcefile.c:917 +#, fuzzy +#| msgid "Input stream doesn't implement seek" +msgid "Input stream doesn’t implement seek" msgstr "Eniga fluo ne realigas serĉon" -#: ../gio/gresource-tool.c:470 ../gio/gsettings-tool.c:530 -msgid "Print help" -msgstr "Presi helpon" - -#: ../gio/gresource-tool.c:471 ../gio/gresource-tool.c:539 -#| msgid "COMMAND" -msgid "[COMMAND]" -msgstr "[KOMANDO]" - -#: ../gio/gresource-tool.c:476 +#: ../gio/gresource-tool.c:494 msgid "List sections containing resources in an elf FILE" msgstr "" -#: ../gio/gresource-tool.c:482 +#: ../gio/gresource-tool.c:500 msgid "" "List resources\n" "If SECTION is given, only list resources in this section\n" "If PATH is given, only list matching resources" msgstr "" -#: ../gio/gresource-tool.c:485 ../gio/gresource-tool.c:495 +#: ../gio/gresource-tool.c:503 ../gio/gresource-tool.c:513 msgid "FILE [PATH]" msgstr "DOSIERO [VOJO]" -#: ../gio/gresource-tool.c:486 ../gio/gresource-tool.c:496 -#: ../gio/gresource-tool.c:503 +#: ../gio/gresource-tool.c:504 ../gio/gresource-tool.c:514 +#: ../gio/gresource-tool.c:521 msgid "SECTION" msgstr "SEKCIO" -#: ../gio/gresource-tool.c:491 +#: ../gio/gresource-tool.c:509 msgid "" "List resources with details\n" "If SECTION is given, only list resources in this section\n" @@ -2062,27 +3330,32 @@ msgid "" "Details include the section, size and compression" msgstr "" -#: ../gio/gresource-tool.c:501 +#: ../gio/gresource-tool.c:519 msgid "Extract a resource file to stdout" msgstr "Eltiri risurcan dosieron al 'stdout'" -#: ../gio/gresource-tool.c:502 +#: ../gio/gresource-tool.c:520 msgid "FILE PATH" msgstr "DOSIERA VOJO" -#: ../gio/gresource-tool.c:508 ../gio/gsettings-tool.c:610 -#, c-format -msgid "" -"Unknown command %s\n" -"\n" -msgstr "" -"Nekonata komando %s\n" -"\n" - -#: ../gio/gresource-tool.c:516 +#: ../gio/gresource-tool.c:534 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " gresource [--section SECTION] COMMAND [ARGS...]\n" +#| "\n" +#| "Commands:\n" +#| " help Show this information\n" +#| " sections List resource sections\n" +#| " list List resources\n" +#| " details List resources with details\n" +#| " extract Extract a resource\n" +#| "\n" +#| "Use 'gresource help COMMAND' to get detailed help.\n" +#| "\n" msgid "" "Usage:\n" -" gresource [--section SECTION] COMMAND [ARGS...]\n" +" gresource [--section SECTION] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -2091,7 +3364,7 @@ msgid "" " details List resources with details\n" " extract Extract a resource\n" "\n" -"Use 'gresource help COMMAND' to get detailed help.\n" +"Use “gresource help COMMAND†to get detailed help.\n" "\n" msgstr "" "Uzo:\n" @@ -2107,7 +3380,7 @@ msgstr "" "Uzu 'gresource help KOMANDO' por akiri helpon detale.\n" "\n" -#: ../gio/gresource-tool.c:530 +#: ../gio/gresource-tool.c:548 #, c-format msgid "" "Usage:\n" @@ -2122,111 +3395,112 @@ msgstr "" "%s\n" "\n" -#: ../gio/gresource-tool.c:533 ../gio/gsettings-tool.c:643 -msgid "Arguments:\n" -msgstr "Argumentoj:\n" - -#: ../gio/gresource-tool.c:537 +#: ../gio/gresource-tool.c:555 msgid " SECTION An (optional) elf section name\n" msgstr " SEKCIO (laÅvola) nomo de elf-a sekcio\n" -#: ../gio/gresource-tool.c:541 ../gio/gsettings-tool.c:650 +#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:654 msgid " COMMAND The (optional) command to explain\n" msgstr " KOMANDO La (laÅvola) komando por klarigi\n" -#: ../gio/gresource-tool.c:547 +#: ../gio/gresource-tool.c:565 msgid " FILE An elf file (a binary or a shared library)\n" msgstr "" -#: ../gio/gresource-tool.c:550 +#: ../gio/gresource-tool.c:568 msgid "" " FILE An elf file (a binary or a shared library)\n" " or a compiled resource file\n" msgstr "" -#: ../gio/gresource-tool.c:554 +#: ../gio/gresource-tool.c:572 msgid "[PATH]" msgstr "[VOJO]" -#: ../gio/gresource-tool.c:556 +#: ../gio/gresource-tool.c:574 msgid " PATH An (optional) resource path (may be partial)\n" msgstr " VOJO (laÅvola) vojo de risurco (eble parta)\n" -#: ../gio/gresource-tool.c:557 +#: ../gio/gresource-tool.c:575 msgid "PATH" msgstr "VOJO" -#: ../gio/gresource-tool.c:559 +#: ../gio/gresource-tool.c:577 msgid " PATH A resource path\n" msgstr " VOJO vojo de risurco\n" -#: ../gio/gsettings-tool.c:53 ../gio/gsettings-tool.c:74 -#, c-format -msgid "No such schema '%s'\n" +#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72 +#: ../gio/gsettings-tool.c:851 +#, fuzzy, c-format +#| msgid "No such schema '%s'\n" +msgid "No such schema “%sâ€\n" msgstr "Neniu tia skemo '%s'\n" -#: ../gio/gsettings-tool.c:59 -#, c-format -msgid "Schema '%s' is not relocatable (path must not be specified)\n" +#: ../gio/gsettings-tool.c:57 +#, fuzzy, c-format +#| msgid "Schema '%s' is not relocatable (path must not be specified)\n" +msgid "Schema “%s†is not relocatable (path must not be specified)\n" msgstr "Skemo '%s' ne estas translokigebla (vojo devas ne esti specifita)\n" -#: ../gio/gsettings-tool.c:80 -#, c-format -msgid "Schema '%s' is relocatable (path must be specified)\n" +#: ../gio/gsettings-tool.c:78 +#, fuzzy, c-format +#| msgid "Schema '%s' is relocatable (path must be specified)\n" +msgid "Schema “%s†is relocatable (path must be specified)\n" msgstr "Skemo '%s' estas translokigebla (vojo devas esti specifita)\n" -#: ../gio/gsettings-tool.c:94 +#: ../gio/gsettings-tool.c:92 #, c-format msgid "Empty path given.\n" msgstr "Malplena vojo estis donita.\n" -#: ../gio/gsettings-tool.c:100 +#: ../gio/gsettings-tool.c:98 #, c-format msgid "Path must begin with a slash (/)\n" msgstr "Vojo devas komenciÄi per oblikvo (/)\n" -#: ../gio/gsettings-tool.c:106 +#: ../gio/gsettings-tool.c:104 #, c-format msgid "Path must end with a slash (/)\n" msgstr "Vojo devas finiÄi per oblikvo (/)\n" -#: ../gio/gsettings-tool.c:112 +#: ../gio/gsettings-tool.c:110 #, c-format msgid "Path must not contain two adjacent slashes (//)\n" msgstr "Vojo devas ne havi du apudajn oblikvojn (//)\n" -#: ../gio/gsettings-tool.c:133 -#, c-format -msgid "No such key '%s'\n" -msgstr "Neniu tia Ålosilo '%s'\n" - -#: ../gio/gsettings-tool.c:503 +#: ../gio/gsettings-tool.c:489 #, c-format msgid "The provided value is outside of the valid range\n" msgstr "La valoro provizita estas preter la valida intervalo\n" -#: ../gio/gsettings-tool.c:536 +#: ../gio/gsettings-tool.c:496 +#, c-format +#| msgid "Property '%s' is not writable" +msgid "The key is not writable\n" +msgstr "La Ålosilo ne estas skribebla\n" + +#: ../gio/gsettings-tool.c:532 msgid "List the installed (non-relocatable) schemas" msgstr "Listigi la instalitajn (ne translokigeblajn) skemojn" -#: ../gio/gsettings-tool.c:542 +#: ../gio/gsettings-tool.c:538 msgid "List the installed relocatable schemas" msgstr "Listigi la instalintajn translokiÄeblajn skemojn" -#: ../gio/gsettings-tool.c:548 +#: ../gio/gsettings-tool.c:544 msgid "List the keys in SCHEMA" msgstr "Listi la Ålosilojn en SKEMO" -#: ../gio/gsettings-tool.c:549 ../gio/gsettings-tool.c:555 -#: ../gio/gsettings-tool.c:592 +#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:551 +#: ../gio/gsettings-tool.c:594 msgid "SCHEMA[:PATH]" msgstr "SKEMO[:VOJO]" -#: ../gio/gsettings-tool.c:554 +#: ../gio/gsettings-tool.c:550 msgid "List the children of SCHEMA" msgstr "Listi la idojn de SKEMO" -#: ../gio/gsettings-tool.c:560 +#: ../gio/gsettings-tool.c:556 msgid "" "List keys and values, recursively\n" "If no SCHEMA is given, list all keys\n" @@ -2234,44 +3508,51 @@ msgstr "" "Listi Ålosilojn kaj valorojn, rikure\n" "Se ne SKEMO estas donita, listi ĉiujn Ålosilojn\n" -#: ../gio/gsettings-tool.c:562 +#: ../gio/gsettings-tool.c:558 msgid "[SCHEMA[:PATH]]" msgstr "[SKEMO[:VOJO]]" -#: ../gio/gsettings-tool.c:567 +#: ../gio/gsettings-tool.c:563 msgid "Get the value of KEY" msgstr "Akiri la valoron de ÅœLOSILO" -#: ../gio/gsettings-tool.c:568 ../gio/gsettings-tool.c:574 -#: ../gio/gsettings-tool.c:586 ../gio/gsettings-tool.c:598 +#: ../gio/gsettings-tool.c:564 ../gio/gsettings-tool.c:570 +#: ../gio/gsettings-tool.c:576 ../gio/gsettings-tool.c:588 +#: ../gio/gsettings-tool.c:600 msgid "SCHEMA[:PATH] KEY" msgstr "SKEMO[:VOJO] ÅœLOSILO" -#: ../gio/gsettings-tool.c:573 +#: ../gio/gsettings-tool.c:569 msgid "Query the range of valid values for KEY" msgstr "Informpeti la intervalon de validaj valoroj por ÅœLOSILO" -#: ../gio/gsettings-tool.c:579 +#: ../gio/gsettings-tool.c:575 +#, fuzzy +#| msgid "Query the range of valid values for KEY" +msgid "Query the description for KEY" +msgstr "Informpeti la intervalon de validaj valoroj por ÅœLOSILO" + +#: ../gio/gsettings-tool.c:581 msgid "Set the value of KEY to VALUE" msgstr "Agordi la valoron de ÅœLOSILO al VALORO" -#: ../gio/gsettings-tool.c:580 +#: ../gio/gsettings-tool.c:582 msgid "SCHEMA[:PATH] KEY VALUE" msgstr "SKEMO[:VOJO] ÅœLOSILO VALORO" -#: ../gio/gsettings-tool.c:585 +#: ../gio/gsettings-tool.c:587 msgid "Reset KEY to its default value" msgstr "ReÅargi ÅœLOSILO-n al Äia defaÅlta valoro" -#: ../gio/gsettings-tool.c:591 +#: ../gio/gsettings-tool.c:593 msgid "Reset all keys in SCHEMA to their defaults" msgstr "ReÅargi ĉiujn Ålosilojn en SKEMO al iliaj defaÅltoj" -#: ../gio/gsettings-tool.c:597 +#: ../gio/gsettings-tool.c:599 msgid "Check if KEY is writable" msgstr "Kontroli ĉu ÅœLOSILO estas skribebla" -#: ../gio/gsettings-tool.c:603 +#: ../gio/gsettings-tool.c:605 msgid "" "Monitor KEY for changes.\n" "If no KEY is specified, monitor all keys in SCHEMA.\n" @@ -2281,14 +3562,37 @@ msgstr "" "Se ÅœLOSILO ne estas specifata, kontroladi ĉiujn Ålosilojn en SKEMO.\n" "Uzu ^C por haltigi kontroladon.\n" -#: ../gio/gsettings-tool.c:606 +#: ../gio/gsettings-tool.c:608 msgid "SCHEMA[:PATH] [KEY]" msgstr "SKEMO[:VOJO] [ÅœLOSILO]" -#: ../gio/gsettings-tool.c:618 +#: ../gio/gsettings-tool.c:620 +#, fuzzy +#| msgid "" +#| "Usage:\n" +#| " gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +#| "\n" +#| "Commands:\n" +#| " help Show this information\n" +#| " list-schemas List installed schemas\n" +#| " list-relocatable-schemas List relocatable schemas\n" +#| " list-keys List keys in a schema\n" +#| " list-children List children of a schema\n" +#| " list-recursively List keys and values, recursively\n" +#| " range Queries the range of a key\n" +#| " get Get the value of a key\n" +#| " set Set the value of a key\n" +#| " reset Reset the value of a key\n" +#| " reset-recursively Reset all values in a given schema\n" +#| " writable Check if a key is writable\n" +#| " monitor Watch for changes\n" +#| "\n" +#| "Use 'gsettings help COMMAND' to get detailed help.\n" +#| "\n" msgid "" "Usage:\n" -" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n" +" gsettings --version\n" +" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n" "\n" "Commands:\n" " help Show this information\n" @@ -2298,6 +3602,7 @@ msgid "" " list-children List children of a schema\n" " list-recursively List keys and values, recursively\n" " range Queries the range of a key\n" +" describe Queries the description of a key\n" " get Get the value of a key\n" " set Set the value of a key\n" " reset Reset the value of a key\n" @@ -2305,10 +3610,11 @@ msgid "" " writable Check if a key is writable\n" " monitor Watch for changes\n" "\n" -"Use 'gsettings help COMMAND' to get detailed help.\n" +"Use “gsettings help COMMAND†to get detailed help.\n" "\n" msgstr "" "Uzo:\n" +" gsettings --version\n" " gsettings [--schemadir SCHEMADIR] KOMANDO [ARGUMENTOJ...]\n" "\n" "Komandoj:\n" @@ -2326,10 +3632,10 @@ msgstr "" " writable Kontroli ĉu Ålosilo estas skribebla\n" " monitor Kontroladi por ÅanÄoj\n" "\n" -"Uzu 'gsettings help KOMANDO' por akiri helpon detale.\n" +"Uzu “gsettings help KOMANDO†por akiri helpon detale.\n" "\n" -#: ../gio/gsettings-tool.c:640 +#: ../gio/gsettings-tool.c:644 #, c-format msgid "" "Usage:\n" @@ -2339,16 +3645,16 @@ msgid "" "\n" msgstr "" "Uzo:\n" -" gsettings [--schemadir SCHEMADIR %s %s\n" +" gsettings [--schemadir SCHEMADIR] %s %s\n" "\n" "%s\n" "\n" -#: ../gio/gsettings-tool.c:646 +#: ../gio/gsettings-tool.c:650 msgid " SCHEMADIR A directory to search for additional schemas\n" msgstr " SCHEMADIR Dosierujo por serĉi pliajn skemojn\n" -#: ../gio/gsettings-tool.c:654 +#: ../gio/gsettings-tool.c:658 msgid "" " SCHEMA The name of the schema\n" " PATH The path, for relocatable schemas\n" @@ -2356,212 +3662,260 @@ msgstr "" " SKEMO La nomo de la skemo\n" " VOJO La vojo, por translokigeblaj skemoj\n" -#: ../gio/gsettings-tool.c:659 +#: ../gio/gsettings-tool.c:663 msgid " KEY The (optional) key within the schema\n" -msgstr " ÅœLOSILO La (laÅvola) Ålosilo interne de la skemo\n" +msgstr " ÅœLOSILO La (laÅvola) Ålosilo interne de la skemo\n" -#: ../gio/gsettings-tool.c:663 +#: ../gio/gsettings-tool.c:667 msgid " KEY The key within the schema\n" -msgstr " ÅœLOSILO La Ålosilo interne de la skemo\n" +msgstr " ÅœLOSILO La Ålosilo interne de la skemo\n" -#: ../gio/gsettings-tool.c:667 +#: ../gio/gsettings-tool.c:671 msgid " VALUE The value to set\n" msgstr " VALUE La valoro agordota\n" -#: ../gio/gsettings-tool.c:788 +#: ../gio/gsettings-tool.c:726 +#, fuzzy, c-format +#| msgid "Could not open converter from '%s' to '%s'" +msgid "Could not load schemas from %s: %s\n" +msgstr "Ne eblas ÅarÄi skemon de %s: %s\n" + +#: ../gio/gsettings-tool.c:738 +#, c-format +#| msgid "No schema files found: " +msgid "No schemas installed\n" +msgstr "Neniuj skemo instalita\n" + +#: ../gio/gsettings-tool.c:809 #, c-format msgid "Empty schema name given\n" msgstr "Malplena skemo-nomo donita\n" -#: ../gio/gsocket.c:282 +#: ../gio/gsettings-tool.c:864 +#, fuzzy, c-format +#| msgid "No such key '%s'\n" +msgid "No such key “%sâ€\n" +msgstr "Neniu tia Ålosilo '%s'\n" + +#: ../gio/gsocket.c:369 msgid "Invalid socket, not initialized" msgstr "Nevalida kontaktskatolo, ne pravalorizita" -#: ../gio/gsocket.c:289 +#: ../gio/gsocket.c:376 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "Nevalida kontaktskatolo, pravalorizo malsukcesis pro: %s" -#: ../gio/gsocket.c:297 +#: ../gio/gsocket.c:384 msgid "Socket is already closed" msgstr "Kontaktskatolo estas jam fermita" -#: ../gio/gsocket.c:305 ../gio/gsocket.c:3520 ../gio/gsocket.c:3575 +#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 +#: ../gio/gsocket.c:3995 msgid "Socket I/O timed out" msgstr "Kontaktoskatolo I/O eltempiÄis" -#: ../gio/gsocket.c:472 +#: ../gio/gsocket.c:531 #, c-format msgid "creating GSocket from fd: %s" -msgstr "Kreanta GSocket de fd: %s" +msgstr "kreanta GSocket de fd: %s" -#: ../gio/gsocket.c:506 ../gio/gsocket.c:522 +#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 #, c-format msgid "Unable to create socket: %s" msgstr "Ne eblas krei kontaktskatolon: %s" -#: ../gio/gsocket.c:506 +#: ../gio/gsocket.c:613 +#, fuzzy +#| msgid "Unknown protocol was specified" +msgid "Unknown family was specified" +msgstr "Nekonata protokolo estis specifita" + +#: ../gio/gsocket.c:620 msgid "Unknown protocol was specified" msgstr "Nekonata protokolo estis specifita" -#: ../gio/gsocket.c:1713 +#: ../gio/gsocket.c:1111 +#, c-format +msgid "Cannot use datagram operations on a non-datagram socket." +msgstr "" + +#: ../gio/gsocket.c:1128 +#, c-format +msgid "Cannot use datagram operations on a socket with a timeout set." +msgstr "" + +#: ../gio/gsocket.c:1932 #, c-format msgid "could not get local address: %s" msgstr "ne eblas akiri lokan adreson: %s" -#: ../gio/gsocket.c:1756 +#: ../gio/gsocket.c:1975 #, c-format msgid "could not get remote address: %s" msgstr "ne eblas akiri foran adreson: %s" -#: ../gio/gsocket.c:1817 +#: ../gio/gsocket.c:2041 #, c-format msgid "could not listen: %s" -msgstr "Ne eblis aÅskulti %s" +msgstr "ne eblas aÅskulti: %s" -#: ../gio/gsocket.c:1891 +#: ../gio/gsocket.c:2140 #, c-format msgid "Error binding to address: %s" msgstr "Eraro dum bindado al la adreso: %s" -#: ../gio/gsocket.c:1944 ../gio/gsocket.c:1980 +#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 #, c-format msgid "Error joining multicast group: %s" msgstr "Eraro kunigante plurelsendgrupon: %s" -#: ../gio/gsocket.c:1945 ../gio/gsocket.c:1981 +#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 #, c-format msgid "Error leaving multicast group: %s" msgstr "Eraro lasante plurelsendgrupon: %s" -#: ../gio/gsocket.c:1946 +#: ../gio/gsocket.c:2257 msgid "No support for source-specific multicast" msgstr "Neniu subteno por fontspecifa plurelsendgrupo" -#: ../gio/gsocket.c:2165 +#: ../gio/gsocket.c:2477 #, c-format msgid "Error accepting connection: %s" msgstr "Eraro dum akcepto de la konekto: %s" -#: ../gio/gsocket.c:2286 +#: ../gio/gsocket.c:2598 msgid "Connection in progress" msgstr "Farata konektado" -#: ../gio/gsocket.c:2338 ../gio/gsocket.c:4317 -#, c-format -msgid "Unable to get pending error: %s" -msgstr "Ne eblas akiri okazontan eraron: %s" +#: ../gio/gsocket.c:2647 +#| msgid "Unable to get pending error: %s" +msgid "Unable to get pending error: " +msgstr "Ne eblas akiri okazontan eraron: " -#: ../gio/gsocket.c:2508 +#: ../gio/gsocket.c:2817 #, c-format msgid "Error receiving data: %s" msgstr "Eraro dum ricevo de la datumaro: %s" -#: ../gio/gsocket.c:2686 +#: ../gio/gsocket.c:3012 #, c-format msgid "Error sending data: %s" msgstr "Eraro dum sendado de la datumaro: %s" -#: ../gio/gsocket.c:2800 +#: ../gio/gsocket.c:3199 #, c-format msgid "Unable to shutdown socket: %s" msgstr "Ne eblas fermi kontaktskatolon: %s" -#: ../gio/gsocket.c:2879 +#: ../gio/gsocket.c:3280 #, c-format msgid "Error closing socket: %s" msgstr "Eraro malfermi kontaktskatolon: %s" -#: ../gio/gsocket.c:3513 +#: ../gio/gsocket.c:3932 #, c-format msgid "Waiting for socket condition: %s" msgstr "Atendanta kontaktskatolon kondiĉon: %s" -#: ../gio/gsocket.c:3791 ../gio/gsocket.c:3872 +#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 #, c-format msgid "Error sending message: %s" msgstr "Eraro dum sendado de la mesaÄo: %s" -#: ../gio/gsocket.c:3816 -msgid "GSocketControlMessage not supported on windows" +#: ../gio/gsocket.c:4428 +#, fuzzy +#| msgid "GSocketControlMessage not supported on windows" +msgid "GSocketControlMessage not supported on Windows" msgstr "GSocketControlMessage ne estas subternata sur Vindozo" -#: ../gio/gsocket.c:4096 ../gio/gsocket.c:4232 +#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 #, c-format msgid "Error receiving message: %s" msgstr "Eraro dum ricevo de la mesaÄo: %s" -#: ../gio/gsocket.c:4336 +#: ../gio/gsocket.c:5452 +#, fuzzy, c-format +#| msgid "Unable to create socket: %s" +msgid "Unable to read socket credentials: %s" +msgstr "Ne eblas krei kontaktskatolon: %s" + +#: ../gio/gsocket.c:5461 msgid "g_socket_get_credentials not implemented for this OS" msgstr "g_socket_get_credentials ne realigita por ĉi tiu mastruma sistemo" -#: ../gio/gsocketclient.c:174 +#: ../gio/gsocketclient.c:176 #, c-format msgid "Could not connect to proxy server %s: " -msgstr "Ne eblis konekti al prokura servilo %s:" +msgstr "Ne eblis konekti al prokura servilo %s: " -#: ../gio/gsocketclient.c:188 +#: ../gio/gsocketclient.c:190 #, c-format msgid "Could not connect to %s: " -msgstr "Ne eblis konekti al '%s: " +msgstr "Ne eblis konekti al %s: " -#: ../gio/gsocketclient.c:190 +#: ../gio/gsocketclient.c:192 msgid "Could not connect: " msgstr "Ne eblis konekti: " -#: ../gio/gsocketclient.c:976 ../gio/gsocketclient.c:1547 +#: ../gio/gsocketclient.c:1027 ../gio/gsocketclient.c:1599 msgid "Unknown error on connect" msgstr "Nekonata eraro okazis je konektado" -#: ../gio/gsocketclient.c:1029 ../gio/gsocketclient.c:1486 -msgid "Trying to proxy over non-TCP connection is not supported." +#: ../gio/gsocketclient.c:1081 ../gio/gsocketclient.c:1535 +#, fuzzy +#| msgid "Trying to proxy over non-TCP connection is not supported." +msgid "Proxying over a non-TCP connection is not supported." msgstr "Provo prokuri tra ne-TCP-a konekto ne estas subtenata." -#: ../gio/gsocketclient.c:1055 ../gio/gsocketclient.c:1507 -#, c-format -msgid "Proxy protocol '%s' is not supported." -msgstr "Prokura protokolo '%s' ne estas subtenata." +#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561 +#, fuzzy, c-format +#| msgid "Proxy protocol '%s' is not supported." +msgid "Proxy protocol “%s†is not supported." +msgstr "Prokura protokolo “%s†ne estas subtenata." -#: ../gio/gsocketlistener.c:191 +#: ../gio/gsocketlistener.c:218 msgid "Listener is already closed" msgstr "AÅskultilo estas jam fermita" -#: ../gio/gsocketlistener.c:232 +#: ../gio/gsocketlistener.c:264 msgid "Added socket is closed" msgstr "Aldonita kontaktskatolo estas fermita" -#: ../gio/gsocks4aproxy.c:121 -#, c-format -msgid "SOCKSv4 does not support IPv6 address '%s'" -msgstr "SOCKSv4 ne subtenas IPv6-an adreson '%s'" +#: ../gio/gsocks4aproxy.c:118 +#, fuzzy, c-format +#| msgid "SOCKSv4 does not support IPv6 address '%s'" +msgid "SOCKSv4 does not support IPv6 address “%sâ€" +msgstr "SOCKSv4 ne subtenas IPv6-an adreson “%sâ€" -#: ../gio/gsocks4aproxy.c:139 +#: ../gio/gsocks4aproxy.c:136 msgid "Username is too long for SOCKSv4 protocol" msgstr "Uzantonomo estas tro longa por SOCKSv4-protokolo" -#: ../gio/gsocks4aproxy.c:156 -#, c-format -msgid "Hostname '%s' is too long for SOCKSv4 protocol" -msgstr "Gastiga komputilonomo '%s' estas tro longa por SOCKSv4-protokolo" +#: ../gio/gsocks4aproxy.c:153 +#, fuzzy, c-format +#| msgid "Hostname '%s' is too long for SOCKSv4 protocol" +msgid "Hostname “%s†is too long for SOCKSv4 protocol" +msgstr "Gastiga komputilonomo “%s†estas tro longa por SOCKSv4-protokolo" -#: ../gio/gsocks4aproxy.c:182 +#: ../gio/gsocks4aproxy.c:179 msgid "The server is not a SOCKSv4 proxy server." -msgstr "La servilo ne estas SOCKSv5-prokura servilo." +msgstr "La servilo ne estas SOCKSv4-prokura servilo." -#: ../gio/gsocks4aproxy.c:189 +#: ../gio/gsocks4aproxy.c:186 msgid "Connection through SOCKSv4 server was rejected" -msgstr "Konekto tra SOCKSv5-servilo malakceptiÄis" +msgstr "Konekto tra SOCKSv4-servilo malakceptiÄis" -#: ../gio/gsocks5proxy.c:155 ../gio/gsocks5proxy.c:326 -#: ../gio/gsocks5proxy.c:336 +#: ../gio/gsocks5proxy.c:153 ../gio/gsocks5proxy.c:324 +#: ../gio/gsocks5proxy.c:334 msgid "The server is not a SOCKSv5 proxy server." msgstr "La servilo ne estas SOCKSv5-prokura servilo." -#: ../gio/gsocks5proxy.c:169 +#: ../gio/gsocks5proxy.c:167 msgid "The SOCKSv5 proxy requires authentication." msgstr "La SOCKSv5-prokurilo bezonas aÅtentokontrolon." -#: ../gio/gsocks5proxy.c:179 +#: ../gio/gsocks5proxy.c:177 msgid "" "The SOCKSv5 proxy requires an authentication method that is not supported by " "GLib." @@ -2569,81 +3923,113 @@ msgstr "" "La SOCKSv5-prokurilo benzonas aÅtentokontrolan metodon ke ne estas subtenita " "per GLib." -#: ../gio/gsocks5proxy.c:208 +#: ../gio/gsocks5proxy.c:206 msgid "Username or password is too long for SOCKSv5 protocol." msgstr "Uzantonomo aÅ pasvorto estas tro longa por SOCKSv5-protokolo." -#: ../gio/gsocks5proxy.c:238 +#: ../gio/gsocks5proxy.c:236 msgid "SOCKSv5 authentication failed due to wrong username or password." msgstr "SOCKSv5-aÅtentokontrolo malsukcesis pro erara uzantonomo aÅ pasvorto." -#: ../gio/gsocks5proxy.c:288 -#, c-format -msgid "Hostname '%s' is too long for SOCKSv5 protocol" -msgstr "Gastiga komputilonomo '%s' estas tro longa por SOCKSv5-protokolo" +#: ../gio/gsocks5proxy.c:286 +#, fuzzy, c-format +#| msgid "Hostname '%s' is too long for SOCKSv5 protocol" +msgid "Hostname “%s†is too long for SOCKSv5 protocol" +msgstr "Gastiga komputilonomo “%s†estas tro longa por SOCKSv5-protokolo" -#: ../gio/gsocks5proxy.c:350 +#: ../gio/gsocks5proxy.c:348 msgid "The SOCKSv5 proxy server uses unknown address type." msgstr "La SOCKSv5-prokura servilo uzas adrestipon kiu estas nekonata." -#: ../gio/gsocks5proxy.c:357 +#: ../gio/gsocks5proxy.c:355 msgid "Internal SOCKSv5 proxy server error." msgstr "Interna SOCKSv5-prokur-servila eraro." -#: ../gio/gsocks5proxy.c:363 +#: ../gio/gsocks5proxy.c:361 msgid "SOCKSv5 connection not allowed by ruleset." msgstr "SOCKSv5-konekto ne estas permesita laÅ servila agordo." -#: ../gio/gsocks5proxy.c:370 +#: ../gio/gsocks5proxy.c:368 msgid "Host unreachable through SOCKSv5 server." msgstr "Gastiga komputilo estas ne kontaktebla per SOCKSv5-servilo." -#: ../gio/gsocks5proxy.c:376 +#: ../gio/gsocks5proxy.c:374 msgid "Network unreachable through SOCKSv5 proxy." msgstr "Loka reto estas ne kontaktebla per SOCKSv5-prokurilo." -#: ../gio/gsocks5proxy.c:382 +#: ../gio/gsocks5proxy.c:380 msgid "Connection refused through SOCKSv5 proxy." msgstr "Konekto ne estis akceptita per SOCKv5 prokurilo." -#: ../gio/gsocks5proxy.c:388 -msgid "SOCKSv5 proxy does not support 'connect' command." -msgstr "Komando 'connect' ne estas subtenata de SOCKSv5-prokurilo." +#: ../gio/gsocks5proxy.c:386 +#, fuzzy +#| msgid "SOCKSv5 proxy does not support 'connect' command." +msgid "SOCKSv5 proxy does not support “connect†command." +msgstr "Komando “connect†ne estas subtenata de SOCKSv5-prokurilo." -#: ../gio/gsocks5proxy.c:394 +#: ../gio/gsocks5proxy.c:392 msgid "SOCKSv5 proxy does not support provided address type." msgstr "Provizita adrestipo ne estas subtenata de SOCKSv5-prokurilo." -#: ../gio/gsocks5proxy.c:400 +#: ../gio/gsocks5proxy.c:398 msgid "Unknown SOCKSv5 proxy error." msgstr "Nekonata SOCKv5 prokurilo eraro." -#: ../gio/gthemedicon.c:498 -#, c-format -msgid "Can't handle version %d of GThemedIcon encoding" +#: ../gio/gthemedicon.c:518 +#, fuzzy, c-format +#| msgid "Can't handle version %d of GThemedIcon encoding" +msgid "Can’t handle version %d of GThemedIcon encoding" msgstr "Ne eblas trakti version %d de GThemedIcon kodoprezento" -#: ../gio/gtlscertificate.c:249 +#: ../gio/gthreadedresolver.c:118 +msgid "No valid addresses were found" +msgstr "" + +#: ../gio/gthreadedresolver.c:213 +#, fuzzy, c-format +#| msgid "Error reverse-resolving '%s': %s" +msgid "Error reverse-resolving “%sâ€: %s" +msgstr "Eraro dum inversa serĉo “%sâ€: %s" + +#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630 +#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778 +#, c-format +msgid "No DNS record of the requested type for “%sâ€" +msgstr "" + +#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733 +#, fuzzy, c-format +#| msgid "Temporarily unable to resolve '%s'" +msgid "Temporarily unable to resolve “%sâ€" +msgstr "Ne eblas solvi “%s†provizore" + +#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 +#, fuzzy, c-format +#| msgid "Error resolving '%s'" +msgid "Error resolving “%sâ€" +msgstr "Eraro dum solvado de “%sâ€" + +#: ../gio/gtlscertificate.c:250 msgid "Cannot decrypt PEM-encoded private key" msgstr "Ne eblas malĉifri PEM-kodigitan privatan Ålosilon" -#: ../gio/gtlscertificate.c:254 +#: ../gio/gtlscertificate.c:255 msgid "No PEM-encoded private key found" msgstr "Neniu PEM-kodigita privata Ålosilo trovita" -#: ../gio/gtlscertificate.c:264 +#: ../gio/gtlscertificate.c:265 msgid "Could not parse PEM-encoded private key" msgstr "Ne eblas analizi PEM-kodigitan privatan Ålosilon" -#: ../gio/gtlscertificate.c:289 +#: ../gio/gtlscertificate.c:290 msgid "No PEM-encoded certificate found" msgstr "Neniu PEM-kodigita atestilo trovita" -#: ../gio/gtlscertificate.c:298 +#: ../gio/gtlscertificate.c:299 msgid "Could not parse PEM-encoded certificate" msgstr "Ne eblas analizi PEM-kodigitan atestilon" -#: ../gio/gtlspassword.c:114 +#: ../gio/gtlspassword.c:111 msgid "" "This is the last chance to enter the password correctly before your access " "is locked out." @@ -2651,789 +4037,836 @@ msgstr "" "Ĉi tiu estas la fina ebleco enigi la pasvorton Äuste antaÅ ol via aliro " "estos barita." -#: ../gio/gtlspassword.c:116 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 +#, fuzzy +#| msgid "" +#| "Several password entered have been incorrect, and your access will be " +#| "locked out after further failures." msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" "Kelkaj eraraj pasvortoj enigitaj, kaj via aliro estos barita se pliaj " "malsukcesoj okazos." -#: ../gio/gtlspassword.c:118 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "La pasvorto enigita estas ne korekta." -#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:580 -#, c-format +#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:561 +#, fuzzy, c-format +#| msgid "Expecting 1 control message, got %d" msgid "Expecting 1 control message, got %d" -msgstr "Atendita 1 stirmesaÄo, akirita %d" +msgid_plural "Expecting 1 control message, got %d" +msgstr[0] "Atendita 1 stirmesaÄo, akirita %d" +msgstr[1] "Atendita 1 stirmesaÄo, akirita %d" -#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:590 +#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:573 msgid "Unexpected type of ancillary data" msgstr "Ne atendita tipo de helpa datumaro" -#: ../gio/gunixconnection.c:195 -#, c-format +#: ../gio/gunixconnection.c:200 +#, fuzzy, c-format +#| msgid "Expecting one fd, but got %d\n" msgid "Expecting one fd, but got %d\n" -msgstr "Atendita unu fd, sed akirita %d\n" +msgid_plural "Expecting one fd, but got %d\n" +msgstr[0] "Atendita unu fd, sed akirita %d\n" +msgstr[1] "Atendita unu fd, sed akirita %d\n" -#: ../gio/gunixconnection.c:211 +#: ../gio/gunixconnection.c:219 msgid "Received invalid fd" msgstr "Akirita ne valida fd" -#: ../gio/gunixconnection.c:347 +#: ../gio/gunixconnection.c:355 msgid "Error sending credentials: " -msgstr "Eraro dum sendo de la akreditaĵoj:" +msgstr "Eraro dum sendo de la akreditaĵoj: " -#: ../gio/gunixconnection.c:511 +#: ../gio/gunixconnection.c:503 #, c-format msgid "Error checking if SO_PASSCRED is enabled for socket: %s" msgstr "" "Eraro kontrolanta ĉu SO_PASSCRED estas enÅaltita por kontaktskatolo: %s" -#: ../gio/gunixconnection.c:520 -#, c-format -msgid "" -"Unexpected option length while checking if SO_PASSCRED is enabled for " -"socket. Expected %d bytes, got %d" -msgstr "" -"Neatendita opciolongo dum kontrolanta ĉu SO_PASSCRED estas enÅaltita por " -"kontaktskatolo. Atendita %d bajtoj, akiras %d" - -#: ../gio/gunixconnection.c:537 +#: ../gio/gunixconnection.c:518 #, c-format msgid "Error enabling SO_PASSCRED: %s" msgstr "Eraro dum enÅalto de SO_PASSCRED: %s" -#: ../gio/gunixconnection.c:568 +#: ../gio/gunixconnection.c:547 msgid "" "Expecting to read a single byte for receiving credentials but read zero bytes" msgstr "" "Atendanta legi unuopan bajton por ricevi akreditaĵojn sed legis neniom da " "bajtoj" -#: ../gio/gunixconnection.c:604 +#: ../gio/gunixconnection.c:587 #, c-format msgid "Not expecting control message, but got %d" msgstr "Ne atendanta stirmesaÄon, sed akiris %d" -#: ../gio/gunixconnection.c:630 +#: ../gio/gunixconnection.c:611 #, c-format msgid "Error while disabling SO_PASSCRED: %s" msgstr "Eraro dum elÅalto de SO_PASSCRED: %s" -#: ../gio/gunixinputstream.c:392 ../gio/gunixinputstream.c:413 -#: ../gio/gunixinputstream.c:493 +#: ../gio/gunixinputstream.c:369 ../gio/gunixinputstream.c:390 #, c-format msgid "Error reading from file descriptor: %s" msgstr "Eraro dum legado de la dosiernumero: %s" -#: ../gio/gunixinputstream.c:448 ../gio/gunixinputstream.c:643 -#: ../gio/gunixoutputstream.c:434 ../gio/gunixoutputstream.c:598 +#: ../gio/gunixinputstream.c:423 ../gio/gunixoutputstream.c:409 +#: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204 #, c-format msgid "Error closing file descriptor: %s" msgstr "Eraro dum fermado de la dosiernumero: %s" -#: ../gio/gunixmounts.c:1983 ../gio/gunixmounts.c:2020 +#: ../gio/gunixmounts.c:2422 ../gio/gunixmounts.c:2475 msgid "Filesystem root" msgstr "Dosiersistema radiko" -#: ../gio/gunixoutputstream.c:378 ../gio/gunixoutputstream.c:399 -#: ../gio/gunixoutputstream.c:479 +#: ../gio/gunixoutputstream.c:355 ../gio/gunixoutputstream.c:376 #, c-format msgid "Error writing to file descriptor: %s" msgstr "Eraro dum skribado de la dosiernumero: %s" -#: ../gio/gunixsocketaddress.c:244 -msgid "Abstract unix domain socket addresses not supported on this system" +#: ../gio/gunixsocketaddress.c:241 +#, fuzzy +#| msgid "Abstract unix domain socket addresses not supported on this system" +msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" "Abstraktaj uniksoretregionaj kontaktoskatolaj adresoj ne estas subtenataj " "sur ĉi tiu sistemo" -#: ../gio/gvolume.c:408 -msgid "volume doesn't implement eject" +#: ../gio/gvolume.c:437 +#, fuzzy +#| msgid "volume doesn't implement eject" +msgid "volume doesn’t implement eject" msgstr "datumportilo ne realigas eject-an funkcion" #. Translators: This is an error #. * message for volume objects that #. * don't implement any of eject or eject_with_operation. -#: ../gio/gvolume.c:488 -msgid "volume doesn't implement eject or eject_with_operation" +#: ../gio/gvolume.c:514 +#, fuzzy +#| msgid "volume doesn't implement eject or eject_with_operation" +msgid "volume doesn’t implement eject or eject_with_operation" msgstr "datumportilo ne realigas eject-an aÅ eject_with_operation-an funkciojn" -#: ../gio/gwin32appinfo.c:276 -msgid "Can't find application" -msgstr "Ne eblas trovi aplikaĵon" - -#: ../gio/gwin32appinfo.c:308 -#, c-format -msgid "Error launching application: %s" -msgstr "Eraro dum lanĉo de la aplikaĵo: %s" - -#: ../gio/gwin32appinfo.c:344 -msgid "URIs not supported" -msgstr "URI-oj ne subtenitaj" - -#: ../gio/gwin32appinfo.c:366 -msgid "association changes not supported on win32" -msgstr "asociigaj ÅanÄoj ne subtenitaj en vin32" - -#: ../gio/gwin32appinfo.c:378 -msgid "Association creation not supported on win32" -msgstr "Asociiga kreado ne subtenita en win32" - -#: ../gio/gwin32inputstream.c:318 +#: ../gio/gwin32inputstream.c:185 #, c-format msgid "Error reading from handle: %s" msgstr "Eraro dum lego de dosiernumero: %s" -#: ../gio/gwin32inputstream.c:348 ../gio/gwin32outputstream.c:348 +#: ../gio/gwin32inputstream.c:232 ../gio/gwin32outputstream.c:219 #, c-format msgid "Error closing handle: %s" msgstr "Eraro dum fermo de dosiernumero: %s" -#: ../gio/gwin32outputstream.c:318 +#: ../gio/gwin32outputstream.c:172 #, c-format msgid "Error writing to handle: %s" msgstr "Eraro dum skribo al dosiernumero: %s" -#: ../gio/gzlibcompressor.c:396 ../gio/gzlibdecompressor.c:349 +#: ../gio/gzlibcompressor.c:394 ../gio/gzlibdecompressor.c:347 msgid "Not enough memory" msgstr "Memoro ne sufiĉas" -#: ../gio/gzlibcompressor.c:403 ../gio/gzlibdecompressor.c:356 +#: ../gio/gzlibcompressor.c:401 ../gio/gzlibdecompressor.c:354 #, c-format msgid "Internal error: %s" msgstr "Interna eraro: %s" -#: ../gio/gzlibcompressor.c:416 ../gio/gzlibdecompressor.c:370 +#: ../gio/gzlibcompressor.c:414 ../gio/gzlibdecompressor.c:368 msgid "Need more input" msgstr "Bezonas pli da enigo" -#: ../gio/gzlibdecompressor.c:342 +#: ../gio/gzlibdecompressor.c:340 msgid "Invalid compressed data" msgstr "Nevalida densigita datumaro" -#: ../glib/gbookmarkfile.c:760 -#, c-format -msgid "Unexpected attribute '%s' for element '%s'" -msgstr "Neatendita atributo '%s' pri elemento '%s'" - -#: ../glib/gbookmarkfile.c:771 ../glib/gbookmarkfile.c:842 -#: ../glib/gbookmarkfile.c:852 ../glib/gbookmarkfile.c:959 -#, c-format -msgid "Attribute '%s' of element '%s' not found" -msgstr "Atributo '%s' de elemento '%s' ne trovita" - -#: ../glib/gbookmarkfile.c:1129 ../glib/gbookmarkfile.c:1194 -#: ../glib/gbookmarkfile.c:1258 ../glib/gbookmarkfile.c:1268 -#, c-format -msgid "Unexpected tag '%s', tag '%s' expected" -msgstr "Etikedo '%s' estas neatendita, etikedo '%s' estas atendita" - -#: ../glib/gbookmarkfile.c:1154 ../glib/gbookmarkfile.c:1168 -#: ../glib/gbookmarkfile.c:1236 ../glib/gbookmarkfile.c:1288 -#, c-format -msgid "Unexpected tag '%s' inside '%s'" -msgstr "Neatendita etikedo '%s' interne de '%s'" - -#: ../glib/gbookmarkfile.c:1806 -msgid "No valid bookmark file found in data dirs" -msgstr "Neniu valida legosigna dosiero estis trovita en datumaj dosierujoj" +#: ../gio/tests/gdbus-daemon.c:18 +msgid "Address to listen on" +msgstr "" -#: ../glib/gbookmarkfile.c:2007 -#, c-format -msgid "A bookmark for URI '%s' already exists" -msgstr "Legosigno por URI '%s' jam ekzistas" +#: ../gio/tests/gdbus-daemon.c:19 +msgid "Ignored, for compat with GTestDbus" +msgstr "" -#: ../glib/gbookmarkfile.c:2053 ../glib/gbookmarkfile.c:2211 -#: ../glib/gbookmarkfile.c:2296 ../glib/gbookmarkfile.c:2376 -#: ../glib/gbookmarkfile.c:2461 ../glib/gbookmarkfile.c:2544 -#: ../glib/gbookmarkfile.c:2622 ../glib/gbookmarkfile.c:2701 -#: ../glib/gbookmarkfile.c:2743 ../glib/gbookmarkfile.c:2840 -#: ../glib/gbookmarkfile.c:2960 ../glib/gbookmarkfile.c:3150 -#: ../glib/gbookmarkfile.c:3226 ../glib/gbookmarkfile.c:3391 -#: ../glib/gbookmarkfile.c:3480 ../glib/gbookmarkfile.c:3570 -#: ../glib/gbookmarkfile.c:3698 -#, c-format -msgid "No bookmark found for URI '%s'" -msgstr "Neniu legosigno trovita por URI '%s'" +#: ../gio/tests/gdbus-daemon.c:20 +#, fuzzy +#| msgid "Print help" +msgid "Print address" +msgstr "Presi helpon" -#: ../glib/gbookmarkfile.c:2385 -#, c-format -msgid "No MIME type defined in the bookmark for URI '%s'" -msgstr "Neniu MIME-tipo estas difinita en la legosigno por URI '%s'" +#: ../gio/tests/gdbus-daemon.c:21 +msgid "Print address in shell mode" +msgstr "" -#: ../glib/gbookmarkfile.c:2470 -#, c-format -msgid "No private flag has been defined in bookmark for URI '%s'" -msgstr "Neniu privata flago estis difinita en legosigno por URI '%s'" +#: ../gio/tests/gdbus-daemon.c:28 +msgid "Run a dbus service" +msgstr "" -#: ../glib/gbookmarkfile.c:2849 +#: ../gio/tests/gdbus-daemon.c:42 #, c-format -msgid "No groups set in bookmark for URI '%s'" -msgstr "Neniuj grupoj agorditaj en legosigno por URI-o '%s'" +msgid "Wrong args\n" +msgstr "" -#: ../glib/gbookmarkfile.c:3244 ../glib/gbookmarkfile.c:3401 -#, c-format -msgid "No application with name '%s' registered a bookmark for '%s'" -msgstr "Neniu aplikaĵo kun nomo '%s' registris legosignon por '%s'" +#: ../glib/gbookmarkfile.c:754 +#, fuzzy, c-format +#| msgid "Unexpected attribute '%s' for element '%s'" +msgid "Unexpected attribute “%s†for element “%sâ€" +msgstr "Neatendita atributo “%s†pri elemento “%sâ€" + +#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836 +#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953 +#, fuzzy, c-format +#| msgid "Attribute '%s' of element '%s' not found" +msgid "Attribute “%s†of element “%s†not found" +msgstr "Atributo “%s†de elemento “%s†ne trovita" + +#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188 +#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262 +#, fuzzy, c-format +#| msgid "Unexpected tag '%s', tag '%s' expected" +msgid "Unexpected tag “%sâ€, tag “%s†expected" +msgstr "Etikedo “%s†estas neatendita, etikedo “%s†estas atendita" + +#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162 +#: ../glib/gbookmarkfile.c:1230 +#, fuzzy, c-format +#| msgid "Unexpected tag '%s' inside '%s'" +msgid "Unexpected tag “%s†inside “%sâ€" +msgstr "Neatendita etikedo “%s†interne de “%sâ€" + +#: ../glib/gbookmarkfile.c:1756 +msgid "No valid bookmark file found in data dirs" +msgstr "Neniu valida legosigna dosiero estis trovita en datumaj dosierujoj" -#: ../glib/gbookmarkfile.c:3424 -#, c-format -msgid "Failed to expand exec line '%s' with URI '%s'" +#: ../glib/gbookmarkfile.c:1957 +#, c-format +#| msgid "A bookmark for URI '%s' already exists" +msgid "A bookmark for URI “%s†already exists" +msgstr "Legosigno por URI “%s†jam ekzistas" + +#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161 +#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326 +#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494 +#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651 +#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790 +#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100 +#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344 +#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522 +#: ../glib/gbookmarkfile.c:3638 +#, fuzzy, c-format +#| msgid "No bookmark found for URI '%s'" +msgid "No bookmark found for URI “%sâ€" +msgstr "Neniu legosigno trovita por URI “%sâ€" + +#: ../glib/gbookmarkfile.c:2335 +#, fuzzy, c-format +#| msgid "No MIME type defined in the bookmark for URI '%s'" +msgid "No MIME type defined in the bookmark for URI “%sâ€" +msgstr "Neniu MIME-tipo estas difinita en la legosigno por URI “%sâ€" + +#: ../glib/gbookmarkfile.c:2420 +#, fuzzy, c-format +#| msgid "No private flag has been defined in bookmark for URI '%s'" +msgid "No private flag has been defined in bookmark for URI “%sâ€" +msgstr "Neniu privata flago estis difinita en legosigno por URI “%sâ€" + +#: ../glib/gbookmarkfile.c:2799 +#, fuzzy, c-format +#| msgid "No groups set in bookmark for URI '%s'" +msgid "No groups set in bookmark for URI “%sâ€" +msgstr "Neniuj grupoj agorditaj en legosigno por URI-o “%sâ€" + +#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354 +#, fuzzy, c-format +#| msgid "No application with name '%s' registered a bookmark for '%s'" +msgid "No application with name “%s†registered a bookmark for “%sâ€" +msgstr "Neniu aplikaĵo kun nomo “%s†registris legosignon por “%sâ€" + +#: ../glib/gbookmarkfile.c:3377 +#, fuzzy, c-format +#| msgid "Failed to expand exec line '%s' with URI '%s'" +msgid "Failed to expand exec line “%s†with URI “%sâ€" msgstr "Malsukcesis ekspansii plenuman linion '%s' per URI '%s'" -#: ../glib/gconvert.c:807 ../glib/gutf8.c:837 ../glib/gutf8.c:1047 -#: ../glib/gutf8.c:1184 ../glib/gutf8.c:1288 +#: ../glib/gconvert.c:477 ../glib/gutf8.c:852 ../glib/gutf8.c:1064 +#: ../glib/gutf8.c:1201 ../glib/gutf8.c:1305 msgid "Partial character sequence at end of input" msgstr "Parta karaktrosekvenco ĉe enigofino" -#: ../glib/gconvert.c:1057 -#, c-format -msgid "Cannot convert fallback '%s' to codeset '%s'" +#: ../glib/gconvert.c:742 +#, fuzzy, c-format +#| msgid "Cannot convert fallback '%s' to codeset '%s'" +msgid "Cannot convert fallback “%s†to codeset “%sâ€" msgstr "Ne eblas konverti la retrodefaÅlton '%s' al kodaro '%s'" -#: ../glib/gconvert.c:1874 -#, c-format -msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +#: ../glib/gconvert.c:1513 +#, fuzzy, c-format +#| msgid "The URI '%s' is not an absolute URI using the \"file\" scheme" +msgid "The URI “%s†is not an absolute URI using the “file†scheme" msgstr "La URI '%s' ne estas absolutan URI uzanta la \"file\"-skemon" -#: ../glib/gconvert.c:1884 -#, c-format -msgid "The local file URI '%s' may not include a '#'" +#: ../glib/gconvert.c:1523 +#, fuzzy, c-format +#| msgid "The local file URI '%s' may not include a '#'" +msgid "The local file URI “%s†may not include a “#â€" msgstr "La loka dosiera URI '%s' devas ne havi la '#'" -#: ../glib/gconvert.c:1901 -#, c-format -msgid "The URI '%s' is invalid" +#: ../glib/gconvert.c:1540 +#, fuzzy, c-format +#| msgid "The URI '%s' is invalid" +msgid "The URI “%s†is invalid" msgstr "La URI '%s' estas nevalida" -#: ../glib/gconvert.c:1913 -#, c-format -msgid "The hostname of the URI '%s' is invalid" +#: ../glib/gconvert.c:1552 +#, fuzzy, c-format +#| msgid "The hostname of the URI '%s' is invalid" +msgid "The hostname of the URI “%s†is invalid" msgstr "La gastiga komputilnomo de la URI '%s' ne estas valida" -#: ../glib/gconvert.c:1929 -#, c-format -msgid "The URI '%s' contains invalidly escaped characters" +#: ../glib/gconvert.c:1568 +#, fuzzy, c-format +#| msgid "The URI '%s' contains invalidly escaped characters" +msgid "The URI “%s†contains invalidly escaped characters" msgstr "La URI '%s' havas karaktrojn kiuj estas eskapataj nevalide" -#: ../glib/gconvert.c:2024 -#, c-format -msgid "The pathname '%s' is not an absolute path" +#: ../glib/gconvert.c:1640 +#, fuzzy, c-format +#| msgid "The pathname '%s' is not an absolute path" +msgid "The pathname “%s†is not an absolute path" msgstr "La vojnomo '%s' ne estas absoluta vojo" -#: ../glib/gconvert.c:2034 -msgid "Invalid hostname" -msgstr "Nevalida gastiga komputilonomo" - -#. Translators: 'before midday' indicator -#: ../glib/gdatetime.c:205 -msgctxt "GDateTime" -msgid "AM" -msgstr "ATM" - -#. Translators: 'after midday' indicator -#: ../glib/gdatetime.c:207 -msgctxt "GDateTime" -msgid "PM" -msgstr "PTM" - #. Translators: this is the preferred format for expressing the date and the time -#: ../glib/gdatetime.c:210 +#: ../glib/gdatetime.c:202 msgctxt "GDateTime" msgid "%a %b %e %H:%M:%S %Y" msgstr "%a %b %e %H:%M:%S %Y" #. Translators: this is the preferred format for expressing the date -#: ../glib/gdatetime.c:213 +#: ../glib/gdatetime.c:205 msgctxt "GDateTime" msgid "%m/%d/%y" msgstr "%F" #. Translators: this is the preferred format for expressing the time -#: ../glib/gdatetime.c:216 +#: ../glib/gdatetime.c:208 msgctxt "GDateTime" msgid "%H:%M:%S" msgstr "%H:%M:%S" #. Translators: this is the preferred format for expressing 12 hour time -#: ../glib/gdatetime.c:219 +#: ../glib/gdatetime.c:211 msgctxt "GDateTime" msgid "%I:%M:%S %p" msgstr "%I:%M:%S %p" -#: ../glib/gdatetime.c:232 +#: ../glib/gdatetime.c:224 msgctxt "full month name" msgid "January" msgstr "januaro" -#: ../glib/gdatetime.c:234 +#: ../glib/gdatetime.c:226 msgctxt "full month name" msgid "February" msgstr "februaro" -#: ../glib/gdatetime.c:236 +#: ../glib/gdatetime.c:228 msgctxt "full month name" msgid "March" msgstr "marto" -#: ../glib/gdatetime.c:238 +#: ../glib/gdatetime.c:230 msgctxt "full month name" msgid "April" msgstr "aprilo" -#: ../glib/gdatetime.c:240 +#: ../glib/gdatetime.c:232 msgctxt "full month name" msgid "May" msgstr "majo" -#: ../glib/gdatetime.c:242 +#: ../glib/gdatetime.c:234 msgctxt "full month name" msgid "June" msgstr "junio" -#: ../glib/gdatetime.c:244 +#: ../glib/gdatetime.c:236 msgctxt "full month name" msgid "July" msgstr "julio" -#: ../glib/gdatetime.c:246 +#: ../glib/gdatetime.c:238 msgctxt "full month name" msgid "August" msgstr "aÅgusto" -#: ../glib/gdatetime.c:248 +#: ../glib/gdatetime.c:240 msgctxt "full month name" msgid "September" msgstr "septembro" -#: ../glib/gdatetime.c:250 +#: ../glib/gdatetime.c:242 msgctxt "full month name" msgid "October" msgstr "oktobro" -#: ../glib/gdatetime.c:252 +#: ../glib/gdatetime.c:244 msgctxt "full month name" msgid "November" msgstr "novembro" -#: ../glib/gdatetime.c:254 +#: ../glib/gdatetime.c:246 msgctxt "full month name" msgid "December" msgstr "decembro" -#: ../glib/gdatetime.c:269 +#: ../glib/gdatetime.c:261 msgctxt "abbreviated month name" msgid "Jan" msgstr "jan" -#: ../glib/gdatetime.c:271 +#: ../glib/gdatetime.c:263 msgctxt "abbreviated month name" msgid "Feb" msgstr "feb" -#: ../glib/gdatetime.c:273 +#: ../glib/gdatetime.c:265 msgctxt "abbreviated month name" msgid "Mar" msgstr "mar" -#: ../glib/gdatetime.c:275 +#: ../glib/gdatetime.c:267 msgctxt "abbreviated month name" msgid "Apr" msgstr "apr" -#: ../glib/gdatetime.c:277 +#: ../glib/gdatetime.c:269 msgctxt "abbreviated month name" msgid "May" msgstr "maj" -#: ../glib/gdatetime.c:279 +#: ../glib/gdatetime.c:271 msgctxt "abbreviated month name" msgid "Jun" msgstr "jun" -#: ../glib/gdatetime.c:281 +#: ../glib/gdatetime.c:273 msgctxt "abbreviated month name" msgid "Jul" msgstr "jul" -#: ../glib/gdatetime.c:283 +#: ../glib/gdatetime.c:275 msgctxt "abbreviated month name" msgid "Aug" msgstr "aÅg" -#: ../glib/gdatetime.c:285 +#: ../glib/gdatetime.c:277 msgctxt "abbreviated month name" msgid "Sep" msgstr "sep" -#: ../glib/gdatetime.c:287 +#: ../glib/gdatetime.c:279 msgctxt "abbreviated month name" msgid "Oct" msgstr "okt" -#: ../glib/gdatetime.c:289 +#: ../glib/gdatetime.c:281 msgctxt "abbreviated month name" msgid "Nov" msgstr "nov" -#: ../glib/gdatetime.c:291 +#: ../glib/gdatetime.c:283 msgctxt "abbreviated month name" msgid "Dec" msgstr "dec" -#: ../glib/gdatetime.c:306 +#: ../glib/gdatetime.c:298 msgctxt "full weekday name" msgid "Monday" msgstr "lundo" -#: ../glib/gdatetime.c:308 +#: ../glib/gdatetime.c:300 msgctxt "full weekday name" msgid "Tuesday" msgstr "mardo" -#: ../glib/gdatetime.c:310 +#: ../glib/gdatetime.c:302 msgctxt "full weekday name" msgid "Wednesday" msgstr "merkredo" -#: ../glib/gdatetime.c:312 +#: ../glib/gdatetime.c:304 msgctxt "full weekday name" msgid "Thursday" msgstr "ĵaÅdo" -#: ../glib/gdatetime.c:314 +#: ../glib/gdatetime.c:306 msgctxt "full weekday name" msgid "Friday" msgstr "vendredo" -#: ../glib/gdatetime.c:316 +#: ../glib/gdatetime.c:308 msgctxt "full weekday name" msgid "Saturday" msgstr "sabato" -#: ../glib/gdatetime.c:318 +#: ../glib/gdatetime.c:310 msgctxt "full weekday name" msgid "Sunday" msgstr "dimanĉo" -#: ../glib/gdatetime.c:333 +#: ../glib/gdatetime.c:325 msgctxt "abbreviated weekday name" msgid "Mon" msgstr "lun" -#: ../glib/gdatetime.c:335 +#: ../glib/gdatetime.c:327 msgctxt "abbreviated weekday name" msgid "Tue" msgstr "mar" -#: ../glib/gdatetime.c:337 +#: ../glib/gdatetime.c:329 msgctxt "abbreviated weekday name" msgid "Wed" msgstr "mer" -#: ../glib/gdatetime.c:339 +#: ../glib/gdatetime.c:331 msgctxt "abbreviated weekday name" msgid "Thu" msgstr "ĵaÅ" -#: ../glib/gdatetime.c:341 +#: ../glib/gdatetime.c:333 msgctxt "abbreviated weekday name" msgid "Fri" msgstr "ven" -#: ../glib/gdatetime.c:343 +#: ../glib/gdatetime.c:335 msgctxt "abbreviated weekday name" msgid "Sat" msgstr "sab" -#: ../glib/gdatetime.c:345 +#: ../glib/gdatetime.c:337 msgctxt "abbreviated weekday name" msgid "Sun" msgstr "dim" -#: ../glib/gdir.c:121 ../glib/gdir.c:144 -#, c-format -msgid "Error opening directory '%s': %s" -msgstr "Eraro dum malfermado de la dosierujo '%s': %s" +#. Translators: 'before midday' indicator +#: ../glib/gdatetime.c:354 +msgctxt "GDateTime" +msgid "AM" +msgstr "ATM" -#: ../glib/gfileutils.c:675 ../glib/gfileutils.c:763 -#, c-format -msgid "Could not allocate %lu bytes to read file \"%s\"" -msgstr "Ne eblis akiri %lu bajtojn por legi la dosieron \"%s\"" +#. Translators: 'after midday' indicator +#: ../glib/gdatetime.c:357 +msgctxt "GDateTime" +msgid "PM" +msgstr "PTM" -#: ../glib/gfileutils.c:690 -#, c-format -msgid "Error reading file '%s': %s" -msgstr "Eraro dum legado de la dosiero '%s': %s" +#: ../glib/gdir.c:155 +#, fuzzy, c-format +#| msgid "Error opening directory '%s': %s" +msgid "Error opening directory “%sâ€: %s" +msgstr "Eraro dum malfermado de la dosierujo '%s': %s" -#: ../glib/gfileutils.c:704 -#, c-format -msgid "File \"%s\" is too large" +#: ../glib/gfileutils.c:706 ../glib/gfileutils.c:798 +#, fuzzy, c-format +#| msgid "Could not allocate %lu bytes to read file \"%s\"" +msgid "Could not allocate %lu byte to read file “%sâ€" +msgid_plural "Could not allocate %lu bytes to read file “%sâ€" +msgstr[0] "Ne eblis akiri %lu bajtojn por legi la dosieron \"%s\"" +msgstr[1] "Ne eblis akiri %lu bajtojn por legi la dosieron \"%s\"" + +#: ../glib/gfileutils.c:723 +#, fuzzy, c-format +#| msgid "Error reading file %s: %s" +msgid "Error reading file “%sâ€: %s" +msgstr "Eraro dum legado de la dosiero %s: %s" + +#: ../glib/gfileutils.c:759 +#, fuzzy, c-format +#| msgid "File \"%s\" is too large" +msgid "File “%s†is too large" msgstr "Dosiero \"%s\" estas tro granda" -#: ../glib/gfileutils.c:787 -#, c-format -msgid "Failed to read from file '%s': %s" +#: ../glib/gfileutils.c:823 +#, fuzzy, c-format +#| msgid "Failed to read from file '%s': %s" +msgid "Failed to read from file “%sâ€: %s" msgstr "Malsukcesis legi el dosiero '%s': %s" -#: ../glib/gfileutils.c:838 ../glib/gfileutils.c:925 -#, c-format -msgid "Failed to open file '%s': %s" +#: ../glib/gfileutils.c:871 ../glib/gfileutils.c:943 +#, fuzzy, c-format +#| msgid "Failed to open file '%s': %s" +msgid "Failed to open file “%sâ€: %s" msgstr "Malsukcesis malfermi dosieron '%s': %s" -#: ../glib/gfileutils.c:855 -#, c-format -msgid "Failed to get attributes of file '%s': fstat() failed: %s" +#: ../glib/gfileutils.c:883 +#, fuzzy, c-format +#| msgid "Failed to get attributes of file '%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%sâ€: fstat() failed: %s" msgstr "Malsukcesis akiri atributojn de dosiero '%s': fstat() malsukcesis: %s" -#: ../glib/gfileutils.c:889 -#, c-format -msgid "Failed to open file '%s': fdopen() failed: %s" +#: ../glib/gfileutils.c:913 +#, fuzzy, c-format +#| msgid "Failed to open file '%s': fdopen() failed: %s" +msgid "Failed to open file “%sâ€: fdopen() failed: %s" msgstr "Malsukcesis malfermi dosieron '%s': fdopen() malsukcesis: %s" -#: ../glib/gfileutils.c:997 -#, c-format -msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +#: ../glib/gfileutils.c:1012 +#, fuzzy, c-format +#| msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s" +msgid "Failed to rename file “%s†to “%sâ€: g_rename() failed: %s" msgstr "" "Malsukcesis alinomi dosieron de '%s' al '%s': g_rename() malsukcesis: %s" -#: ../glib/gfileutils.c:1039 ../glib/gfileutils.c:1584 -#, c-format -msgid "Failed to create file '%s': %s" +#: ../glib/gfileutils.c:1047 ../glib/gfileutils.c:1554 +#, fuzzy, c-format +#| msgid "Failed to create file '%s': %s" +msgid "Failed to create file “%sâ€: %s" msgstr "Malsukcesis krei dosieron '%s': %s" -#: ../glib/gfileutils.c:1053 -#, c-format -msgid "Failed to open file '%s' for writing: fdopen() failed: %s" -msgstr "" -"Malsukcesis malfermi dosieron '%s' por skribi: fdopen() malsukcesis: %s" - -#: ../glib/gfileutils.c:1078 +#: ../glib/gfileutils.c:1074 #, c-format -msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "Malsukcesis skribi dosieron '%s': fwrite() malsukcesis: %s" +#| msgid "Failed to write file '%s': fwrite() failed: %s" +msgid "Failed to write file “%sâ€: write() failed: %s" +msgstr "Malsukcesis skribi dosieron “%sâ€: write() malsukcesis: %s" -#: ../glib/gfileutils.c:1097 -#, c-format -msgid "Failed to write file '%s': fflush() failed: %s" -msgstr "Skribi dosieron malsukcesis '%s': fflush() malsukcesis: %s" - -#: ../glib/gfileutils.c:1141 -#, c-format -msgid "Failed to write file '%s': fsync() failed: %s" +#: ../glib/gfileutils.c:1117 +#, fuzzy, c-format +#| msgid "Failed to write file '%s': fsync() failed: %s" +msgid "Failed to write file “%sâ€: fsync() failed: %s" msgstr "Skribi dosieron malsukcesis '%s': fsync() malsukcesis: %s" -#: ../glib/gfileutils.c:1165 -#, c-format -msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Malsukcesis fermi dosieron '%s': fclose() malsukcesis: %s" - -#: ../glib/gfileutils.c:1287 -#, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +#: ../glib/gfileutils.c:1241 +#, fuzzy, c-format +#| msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" +msgid "Existing file “%s†could not be removed: g_unlink() failed: %s" msgstr "Ne eblas forigi ekzistatan dosieron '%s': g_unlink() malsukcesis: %s" -#: ../glib/gfileutils.c:1547 -#, c-format -msgid "Template '%s' invalid, should not contain a '%s'" +#: ../glib/gfileutils.c:1520 +#, fuzzy, c-format +#| msgid "Template '%s' invalid, should not contain a '%s'" +msgid "Template “%s†invalid, should not contain a “%sâ€" msgstr "Åœablono '%s' ne estas valida, Äi devas ne havi '%s'" -#: ../glib/gfileutils.c:1560 -#, c-format -msgid "Template '%s' doesn't contain XXXXXX" +#: ../glib/gfileutils.c:1533 +#, fuzzy, c-format +#| msgid "Template '%s' doesn't contain XXXXXX" +msgid "Template “%s†doesn’t contain XXXXXX" msgstr "Åœablono '%s' ne havas XXXXXX" -#: ../glib/gfileutils.c:2088 -#, c-format -msgid "Failed to read the symbolic link '%s': %s" +#: ../glib/gfileutils.c:2058 +#, fuzzy, c-format +#| msgid "Failed to read the symbolic link '%s': %s" +msgid "Failed to read the symbolic link “%sâ€: %s" msgstr "Malsukcesis legi la simbolan ligilon '%s': %s" -#: ../glib/gfileutils.c:2109 -msgid "Symbolic links not supported" -msgstr "Simbolaj ligiloj ne estas subtenataj" - -#: ../glib/giochannel.c:1415 -#, c-format -msgid "Could not open converter from '%s' to '%s': %s" +#: ../glib/giochannel.c:1388 +#, fuzzy, c-format +#| msgid "Could not open converter from '%s' to '%s': %s" +msgid "Could not open converter from “%s†to “%sâ€: %s" msgstr "Ne eblis malfermi konvertilon de '%s al '%s: %s" -#: ../glib/giochannel.c:1760 -msgid "Can't do a raw read in g_io_channel_read_line_string" +#: ../glib/giochannel.c:1733 +#, fuzzy +#| msgid "Can't do a raw read in g_io_channel_read_line_string" +msgid "Can’t do a raw read in g_io_channel_read_line_string" msgstr "Ne eblas fari krudan legon en g_io_channel_read_line_string" -#: ../glib/giochannel.c:1807 ../glib/giochannel.c:2064 -#: ../glib/giochannel.c:2151 +#: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038 +#: ../glib/giochannel.c:2125 msgid "Leftover unconverted data in read buffer" msgstr "Kroma nekonvertita datumaro en legbufro" -#: ../glib/giochannel.c:1888 ../glib/giochannel.c:1965 +#: ../glib/giochannel.c:1861 ../glib/giochannel.c:1938 msgid "Channel terminates in a partial character" msgstr "Kanalo finas per parta karaktro" -#: ../glib/giochannel.c:1951 -msgid "Can't do a raw read in g_io_channel_read_to_end" +#: ../glib/giochannel.c:1924 +#, fuzzy +#| msgid "Can't do a raw read in g_io_channel_read_to_end" +msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "Ne eblas fari krudan legon en g_io_channel_read_to_end" -#: ../glib/gkeyfile.c:726 +#: ../glib/gkeyfile.c:736 msgid "Valid key file could not be found in search dirs" msgstr "Valida Ålosilodosiero ne povas esti trovita en serĉaj dosierujoj" -#: ../glib/gkeyfile.c:762 +#: ../glib/gkeyfile.c:772 msgid "Not a regular file" msgstr "Ne estas regula dosiero" -#: ../glib/gkeyfile.c:1162 -#, c-format +#: ../glib/gkeyfile.c:1212 +#, fuzzy, c-format +#| msgid "" +#| "Key file contains line '%s' which is not a key-value pair, group, or " +#| "comment" 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 "" "Åœlosilodosiero havas linion '%s' kiu ne estas Ålosilo-valoro paro, grupo, aÅ " "komento" -#: ../glib/gkeyfile.c:1222 +#: ../glib/gkeyfile.c:1269 #, c-format msgid "Invalid group name: %s" msgstr "Nevalida grupa nomo: %s" -#: ../glib/gkeyfile.c:1244 +#: ../glib/gkeyfile.c:1291 msgid "Key file does not start with a group" msgstr "Åœlosilodosiero ne komenciÄas per grupo" -#: ../glib/gkeyfile.c:1270 +#: ../glib/gkeyfile.c:1317 #, c-format msgid "Invalid key name: %s" msgstr "Nevalida Ålosilonomo: %s" -#: ../glib/gkeyfile.c:1297 -#, c-format -msgid "Key file contains unsupported encoding '%s'" +#: ../glib/gkeyfile.c:1344 +#, fuzzy, c-format +#| msgid "Key file contains unsupported encoding '%s'" +msgid "Key file contains unsupported encoding “%sâ€" msgstr "Åœlosilodosiero havas nesubtenatan kodoprezenton '%s'" -#: ../glib/gkeyfile.c:1541 ../glib/gkeyfile.c:1703 ../glib/gkeyfile.c:3081 -#: ../glib/gkeyfile.c:3147 ../glib/gkeyfile.c:3273 ../glib/gkeyfile.c:3406 -#: ../glib/gkeyfile.c:3548 ../glib/gkeyfile.c:3778 ../glib/gkeyfile.c:3846 -#, c-format -msgid "Key file does not have group '%s'" +#: ../glib/gkeyfile.c:1587 ../glib/gkeyfile.c:1760 ../glib/gkeyfile.c:3140 +#: ../glib/gkeyfile.c:3203 ../glib/gkeyfile.c:3333 ../glib/gkeyfile.c:3463 +#: ../glib/gkeyfile.c:3607 ../glib/gkeyfile.c:3836 ../glib/gkeyfile.c:3903 +#, fuzzy, c-format +#| msgid "Key file does not have group '%s'" +msgid "Key file does not have group “%sâ€" msgstr "Åœlosilodosiero ne havas grupon '%s'" #: ../glib/gkeyfile.c:1715 -#, c-format -msgid "Key file does not have key '%s'" -msgstr "Åœlosilodosiero ne havas Ålosilon '%s'" +#, fuzzy, c-format +#| msgid "Key file does not have key '%s' in group '%s'" +msgid "Key file does not have key “%s†in group “%sâ€" +msgstr "Åœlosilodosiero ne havas Ålosilon '%s' en grupo '%s'" -#: ../glib/gkeyfile.c:1822 ../glib/gkeyfile.c:1938 -#, c-format -msgid "Key file contains key '%s' with value '%s' which is not UTF-8" +#: ../glib/gkeyfile.c:1877 ../glib/gkeyfile.c:1993 +#, fuzzy, 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 "Åœlosildosiero havas Ålosilon '%s' kun valoro '%s' kiu ne estas UTF-8" -#: ../glib/gkeyfile.c:1842 ../glib/gkeyfile.c:1958 ../glib/gkeyfile.c:2327 -#, c-format +#: ../glib/gkeyfile.c:1897 ../glib/gkeyfile.c:2013 ../glib/gkeyfile.c:2382 +#, fuzzy, c-format +#| msgid "" +#| "Key file contains key '%s' which has a value that cannot be interpreted." 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 "Åœlosildosiero havas Ålosilon '%s' kiu havas neinterpeteblan valoron." -#: ../glib/gkeyfile.c:2544 ../glib/gkeyfile.c:2910 -#, c-format +#: ../glib/gkeyfile.c:2600 ../glib/gkeyfile.c:2969 +#, fuzzy, c-format +#| msgid "" +#| "Key file contains key '%s' in group '%s' which has a value that cannot be " +#| "interpreted." msgid "" -"Key file contains key '%s' in group '%s' which has a value that cannot be " +"Key file contains key “%s†in group “%s†which has a value that cannot be " "interpreted." msgstr "" "Åœlosilodosiero havas Ålosilon '%s' en grupo '%s' kiu havas neinterpeteblan " "valoron." -#: ../glib/gkeyfile.c:2622 ../glib/gkeyfile.c:2698 +#: ../glib/gkeyfile.c:2678 ../glib/gkeyfile.c:2755 #, c-format -msgid "Key '%s' in group '%s' has value '%s' where %s was expected" -msgstr "Åœlosilo '%s' en grupo '%s' havas valoron '%s' kie %s estis atendita." +#| msgid "Key '%s' in group '%s' has value '%s' where %s was expected" +msgid "Key “%s†in group “%s†has value “%s†where %s was expected" +msgstr "Åœlosilo “%s†en grupo “%s†havas valoron “%s†kie %s estis atendita" -#: ../glib/gkeyfile.c:3096 ../glib/gkeyfile.c:3288 ../glib/gkeyfile.c:3857 -#, c-format -msgid "Key file does not have key '%s' in group '%s'" -msgstr "Åœlosilodosiero ne havas Ålosilon '%s' en grupo '%s'" - -#: ../glib/gkeyfile.c:4089 +#: ../glib/gkeyfile.c:4143 msgid "Key file contains escape character at end of line" msgstr "Åœlosilodosiero havas kodÅanÄan signon ĉe fino de linio" -#: ../glib/gkeyfile.c:4111 -#, c-format -msgid "Key file contains invalid escape sequence '%s'" +#: ../glib/gkeyfile.c:4165 +#, fuzzy, c-format +#| msgid "Key file contains invalid escape sequence '%s'" +msgid "Key file contains invalid escape sequence “%sâ€" msgstr "La Ålosildosiero havas nevalidan kodÅanÄan sekvencon '%s'" -#: ../glib/gkeyfile.c:4253 -#, c-format -msgid "Value '%s' cannot be interpreted as a number." +#: ../glib/gkeyfile.c:4307 +#, fuzzy, c-format +#| msgid "Value '%s' cannot be interpreted as a number." +msgid "Value “%s†cannot be interpreted as a number." msgstr "Valoro '%s' neinterpreteblas kiel nombro." -#: ../glib/gkeyfile.c:4267 -#, c-format -msgid "Integer value '%s' out of range" +#: ../glib/gkeyfile.c:4321 +#, fuzzy, c-format +#| msgid "Integer value '%s' out of range" +msgid "Integer value “%s†out of range" msgstr "Entjera valoro '%s' estas ekster la intervalo" -#: ../glib/gkeyfile.c:4300 -#, c-format -msgid "Value '%s' cannot be interpreted as a float number." +#: ../glib/gkeyfile.c:4354 +#, fuzzy, c-format +#| msgid "Value '%s' cannot be interpreted as a float number." +msgid "Value “%s†cannot be interpreted as a float number." msgstr "Valoro '%s' neinterpreteblas kiel glita nombro." -#: ../glib/gkeyfile.c:4324 -#, c-format -msgid "Value '%s' cannot be interpreted as a boolean." +#: ../glib/gkeyfile.c:4393 +#, fuzzy, c-format +#| msgid "Value '%s' cannot be interpreted as a boolean." +msgid "Value “%s†cannot be interpreted as a boolean." msgstr "Valoro '%s' neinterpreteblas kiel bulea." -#: ../glib/gmappedfile.c:128 -#, c-format -msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +#: ../glib/gmappedfile.c:129 +#, fuzzy, c-format +#| msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s" +msgid "Failed to get attributes of file “%s%s%s%sâ€: fstat() failed: %s" msgstr "" "Malsukcesis akiri atributojn de dosiero '%s%s%s%s': fstat() malsukcesis: %s" -#: ../glib/gmappedfile.c:194 +#: ../glib/gmappedfile.c:195 #, c-format msgid "Failed to map %s%s%s%s: mmap() failed: %s" msgstr "Malsukcesis mapigi dosieron %s%s%s%s: mmap() malsukcesis: %s" -#: ../glib/gmappedfile.c:260 -#, c-format -msgid "Failed to open file '%s': open() failed: %s" +#: ../glib/gmappedfile.c:262 +#, fuzzy, c-format +#| msgid "Failed to open file '%s': open() failed: %s" +msgid "Failed to open file “%sâ€: open() failed: %s" msgstr "Malsukcesis malfermi dosieron '%s': open() malsukcesis: %s" -#: ../glib/gmarkup.c:356 ../glib/gmarkup.c:397 +#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439 #, c-format msgid "Error on line %d char %d: " msgstr "Eraro sur linio %d karaktro %d: " -#: ../glib/gmarkup.c:419 ../glib/gmarkup.c:502 +#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544 #, c-format msgid "Invalid UTF-8 encoded text in name - not valid '%s'" msgstr "Nevalida UTF-8-kodigita teksto en nomo - ne valida '%s'" -#: ../glib/gmarkup.c:430 +#: ../glib/gmarkup.c:472 #, c-format -msgid "'%s' is not a valid name " -msgstr "'%s' ne estas valida nomo " +#| msgid "'%s' is not a valid name " +msgid "'%s' is not a valid name" +msgstr "'%s' ne estas valida nomo" -#: ../glib/gmarkup.c:446 +#: ../glib/gmarkup.c:488 #, c-format -msgid "'%s' is not a valid name: '%c' " -msgstr "'%s' ne estas valida nomo: '%c' " +#| msgid "'%s' is not a valid name: '%c' " +msgid "'%s' is not a valid name: '%c'" +msgstr "'%s' ne estas valida nomo: '%c'" -#: ../glib/gmarkup.c:555 +#: ../glib/gmarkup.c:598 #, c-format msgid "Error on line %d: %s" msgstr "Eraro sur linio %d: %s" -#: ../glib/gmarkup.c:639 +#: ../glib/gmarkup.c:675 #, c-format msgid "" "Failed to parse '%-.*s', which should have been a digit inside a character " "reference (ê for example) - perhaps the digit is too large" msgstr "" -"Malsukcesis analizi '%-.*s', kiu devus esti cifero en karaktra referenco " -"(ekz. ê) - la cifero estas eble tro granda" +"Malsukcesis analizi '%-.*s', kiu devus esti cifero en karaktra referenco (" +"ekzemple ê) - la cifero estas eble tro granda" -#: ../glib/gmarkup.c:651 +#: ../glib/gmarkup.c:687 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity - escape ampersand " @@ -3442,24 +4875,24 @@ msgstr "" "Karaktra referenco ne finis per punktokomo; vi verÅajne uzas kaj-signon sen " "intenco komencigi eron - nuligu kaj-signon kiel &" -#: ../glib/gmarkup.c:677 +#: ../glib/gmarkup.c:713 #, c-format msgid "Character reference '%-.*s' does not encode a permitted character" msgstr "Karaktra referenco '%-.*s' ne enkodigas permesatan karaktron" -#: ../glib/gmarkup.c:715 +#: ../glib/gmarkup.c:751 msgid "" "Empty entity '&;' seen; valid entities are: & " < > '" msgstr "" "Malplena ento '&;' vidita; validaj entoj estas : & " < > " "'" -#: ../glib/gmarkup.c:723 +#: ../glib/gmarkup.c:759 #, c-format msgid "Entity name '%-.*s' is not known" msgstr "Ento-nomo '%-.*s' ne estas konata" -#: ../glib/gmarkup.c:728 +#: ../glib/gmarkup.c:764 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity - escape ampersand as &" @@ -3467,11 +4900,11 @@ msgstr "" "Ento ne finiÄis per punktokomo; vi eble uzis kaj-signon sen intenco " "komencigi enton - nuligu kaj-signon kiel &" -#: ../glib/gmarkup.c:1076 +#: ../glib/gmarkup.c:1170 msgid "Document must begin with an element (e.g. <book>)" msgstr "Dokumento devas komenci per elemento (ekz. <book>)" -#: ../glib/gmarkup.c:1116 +#: ../glib/gmarkup.c:1210 #, c-format msgid "" "'%s' is not a valid character following a '<' character; it may not begin an " @@ -3480,7 +4913,7 @@ msgstr "" "'%s' ne estas valida karaktro post '<' karaktro; Äi ne povas komenci " "elementan nomon" -#: ../glib/gmarkup.c:1184 +#: ../glib/gmarkup.c:1252 #, c-format msgid "" "Odd character '%s', expected a '>' character to end the empty-element tag " @@ -3489,7 +4922,7 @@ msgstr "" "Malbona karaktro '%s', karaktro '>' atendita por fini la malplena-elementon " "etikedon '%s'" -#: ../glib/gmarkup.c:1268 +#: ../glib/gmarkup.c:1333 #, c-format msgid "" "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'" @@ -3497,7 +4930,7 @@ msgstr "" "Malbona karaktro '%s', karaktro '=' estas atendita post atributnomo '%s' de " "elemento '%s'" -#: ../glib/gmarkup.c:1309 +#: ../glib/gmarkup.c:1374 #, c-format msgid "" "Odd character '%s', expected a '>' or '/' character to end the start tag of " @@ -3505,10 +4938,10 @@ msgid "" "character in an attribute name" msgstr "" "Malbona karaktro '%s', '>' aÅ '/' estas atendita por fini la komencan " -"etikedon de elemento '%s' aÅ laÅvole atributon; eble vi uzas nevalidan " +"etikedon de elemento '%s', aÅ laÅvole atributon; eble vi uzas nevalidan " "karaktron en atributnomo" -#: ../glib/gmarkup.c:1353 +#: ../glib/gmarkup.c:1418 #, c-format msgid "" "Odd character '%s', expected an open quote mark after the equals sign when " @@ -3517,7 +4950,7 @@ msgstr "" "Malbona karaktro '%s', maldekstra citilo estas atendita post la egalsigno " "kiam donanta valoron por atributo '%s' de elemento '%s'" -#: ../glib/gmarkup.c:1486 +#: ../glib/gmarkup.c:1551 #, c-format msgid "" "'%s' is not a valid character following the characters '</'; '%s' may not " @@ -3526,7 +4959,7 @@ msgstr "" "'%s' ne estas valida karaktro post la karaktroj '</'; '%s' ne povas komenci " "elementnomon" -#: ../glib/gmarkup.c:1522 +#: ../glib/gmarkup.c:1587 #, c-format msgid "" "'%s' is not a valid character following the close element name '%s'; the " @@ -3535,25 +4968,25 @@ msgstr "" "'%s' ne estas valida karaktro post la fermiga elementnomo '%s'; la permesata " "karaktro estas '>'" -#: ../glib/gmarkup.c:1533 +#: ../glib/gmarkup.c:1598 #, c-format msgid "Element '%s' was closed, no element is currently open" msgstr "Elemento '%s' estis fermita, neniu elemento estas malferma nun" -#: ../glib/gmarkup.c:1542 +#: ../glib/gmarkup.c:1607 #, c-format msgid "Element '%s' was closed, but the currently open element is '%s'" msgstr "Elemento '%s' estis fermita, sed la malfermita elemento estas '%s' nun" -#: ../glib/gmarkup.c:1710 +#: ../glib/gmarkup.c:1760 msgid "Document was empty or contained only whitespace" msgstr "Dokumento estis malpena aÅ Äi havis nur blankspacon" -#: ../glib/gmarkup.c:1724 +#: ../glib/gmarkup.c:1774 msgid "Document ended unexpectedly just after an open angle bracket '<'" msgstr "Dokumento finiÄis neatendite tuj post maldekstra angulkrampon '<'" -#: ../glib/gmarkup.c:1732 ../glib/gmarkup.c:1777 +#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827 #, c-format msgid "" "Document ended unexpectedly with elements still open - '%s' was the last " @@ -3562,7 +4995,7 @@ msgstr "" "Dokumento finiÄis neatendite kun elementoj ankoraÅ malfermaj - '%s' estis la " "elemento malfermita laste" -#: ../glib/gmarkup.c:1740 +#: ../glib/gmarkup.c:1790 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " @@ -3571,19 +5004,19 @@ msgstr "" "Dokumento finiÄis neatendite, atendis vidi etikedon finiÄanta per dekstra " "angulkrampo <%s/>" -#: ../glib/gmarkup.c:1746 +#: ../glib/gmarkup.c:1796 msgid "Document ended unexpectedly inside an element name" msgstr "Dokumento finiÄis neatendite interne de elementnomo" -#: ../glib/gmarkup.c:1752 +#: ../glib/gmarkup.c:1802 msgid "Document ended unexpectedly inside an attribute name" msgstr "Dokumento finiÄis neatendite interne de atributnomo" -#: ../glib/gmarkup.c:1757 +#: ../glib/gmarkup.c:1807 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "Dokumento finiÄis neatendite interne de elemento-malfermanta etikedo." -#: ../glib/gmarkup.c:1763 +#: ../glib/gmarkup.c:1813 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" @@ -3591,504 +5024,632 @@ msgstr "" "Dokumento finiÄis neatendite post la egalsigno sekvanta atributnomo; neniu " "atributvaloro" -#: ../glib/gmarkup.c:1770 +#: ../glib/gmarkup.c:1820 msgid "Document ended unexpectedly while inside an attribute value" msgstr "Dokumento finiÄis neatendite dum interne de atributvaloro" -#: ../glib/gmarkup.c:1786 +#: ../glib/gmarkup.c:1836 #, c-format msgid "Document ended unexpectedly inside the close tag for element '%s'" msgstr "Dokumento finiÄis interne de la ferma etikedo por elemento '%s'" -#: ../glib/gmarkup.c:1792 +#: ../glib/gmarkup.c:1842 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "Dokumento finiÄis neatendite interne de komento aÅ traktada instrukcio" -#: ../glib/goption.c:766 -msgid "Usage:" -msgstr "Uzo:" - -#: ../glib/goption.c:766 -msgid "[OPTION...]" +#: ../glib/goption.c:861 +#, fuzzy +#| msgid "[OPTION...]" +msgid "[OPTION…]" msgstr "[OPCIO...]" -#: ../glib/goption.c:872 +#: ../glib/goption.c:977 msgid "Help Options:" msgstr "Helpaj Opcioj:" -#: ../glib/goption.c:873 +#: ../glib/goption.c:978 msgid "Show help options" msgstr "Montri helpajn opciojn" -#: ../glib/goption.c:879 +#: ../glib/goption.c:984 msgid "Show all help options" msgstr "Montri ĉiujn helpan opciojn" -#: ../glib/goption.c:941 +#: ../glib/goption.c:1047 msgid "Application Options:" msgstr "Aplikaĵaj Opcioj:" -#: ../glib/goption.c:1003 ../glib/goption.c:1073 -#, c-format -msgid "Cannot parse integer value '%s' for %s" +#: ../glib/goption.c:1049 +#| msgid "Help Options:" +msgid "Options:" +msgstr "Opcioj:" + +#: ../glib/goption.c:1113 ../glib/goption.c:1183 +#, fuzzy, c-format +#| msgid "Cannot parse integer value '%s' for %s" +msgid "Cannot parse integer value “%s†for %s" msgstr "Ne eblas analizi entjeran valoron '%s' de %s" -#: ../glib/goption.c:1013 ../glib/goption.c:1081 -#, c-format -msgid "Integer value '%s' for %s out of range" +#: ../glib/goption.c:1123 ../glib/goption.c:1191 +#, fuzzy, c-format +#| msgid "Integer value '%s' for %s out of range" +msgid "Integer value “%s†for %s out of range" msgstr "Entjera valoro '%s' de %s estas ekster la intervalo" -#: ../glib/goption.c:1038 -#, c-format -msgid "Cannot parse double value '%s' for %s" +#: ../glib/goption.c:1148 +#, fuzzy, c-format +#| msgid "Cannot parse double value '%s' for %s" +msgid "Cannot parse double value “%s†for %s" msgstr "Ne eblas analizi duoblan valoron '%s' de %s" -#: ../glib/goption.c:1046 -#, c-format -msgid "Double value '%s' for %s out of range" +#: ../glib/goption.c:1156 +#, fuzzy, c-format +#| msgid "Double value '%s' for %s out of range" +msgid "Double value “%s†for %s out of range" msgstr "Duobla valoro '%s' de %s estas ekster la intervalo" -#: ../glib/goption.c:1309 ../glib/goption.c:1388 +#: ../glib/goption.c:1448 ../glib/goption.c:1527 #, c-format msgid "Error parsing option %s" msgstr "Eraro dum sintaksa analizo de la opcio %s" -#: ../glib/goption.c:1419 ../glib/goption.c:1532 +#: ../glib/goption.c:1558 ../glib/goption.c:1671 #, c-format msgid "Missing argument for %s" msgstr "Mankas argumento de %s" -#: ../glib/goption.c:1985 +#: ../glib/goption.c:2132 #, c-format msgid "Unknown option %s" msgstr "Nekonata opcio %s" -#: ../glib/gregex.c:190 +#: ../glib/gregex.c:257 msgid "corrupted object" msgstr "difektita objekto" -#: ../glib/gregex.c:192 +#: ../glib/gregex.c:259 msgid "internal error or corrupted object" msgstr "interna eraro aÅ difektita objekto" -#: ../glib/gregex.c:194 +#: ../glib/gregex.c:261 msgid "out of memory" msgstr "memormanko" -#: ../glib/gregex.c:199 +#: ../glib/gregex.c:266 msgid "backtracking limit reached" msgstr "retrospurada limo estas atingata" -#: ../glib/gregex.c:211 ../glib/gregex.c:219 +#: ../glib/gregex.c:278 ../glib/gregex.c:286 msgid "the pattern contains items not supported for partial matching" -msgstr "La modelo havas erojn kiuj ne estas subtenataj por parta kongruado" +msgstr "la modelo havas erojn kiuj ne estas subtenataj por parta kongruado" + +#: ../glib/gregex.c:280 +msgid "internal error" +msgstr "interna eraro" -#: ../glib/gregex.c:221 +#: ../glib/gregex.c:288 msgid "back references as conditions are not supported for partial matching" msgstr "retroreferencoj kiel kondiĉoj ne estas subtenataj por parta kongruado" -#: ../glib/gregex.c:230 +#: ../glib/gregex.c:297 msgid "recursion limit reached" msgstr "rekurslimo atingita" -#: ../glib/gregex.c:232 -msgid "workspace limit for empty substrings reached" -msgstr "laborspaca limo por malplenaj subĉenoj estas atingitaj" - -#: ../glib/gregex.c:234 +#: ../glib/gregex.c:299 msgid "invalid combination of newline flags" msgstr "nevalida kombinaĵo de novlinioj flagoj" -#: ../glib/gregex.c:236 +#: ../glib/gregex.c:301 msgid "bad offset" msgstr "malbona deÅovo" -#: ../glib/gregex.c:238 +#: ../glib/gregex.c:303 msgid "short utf8" msgstr "mallonga utf8" -#: ../glib/gregex.c:242 +#: ../glib/gregex.c:305 +msgid "recursion loop" +msgstr "" + +#: ../glib/gregex.c:309 msgid "unknown error" msgstr "nekonata eraro" -#: ../glib/gregex.c:262 +#: ../glib/gregex.c:329 msgid "\\ at end of pattern" msgstr "\\ ĉe fino de modelo" -#: ../glib/gregex.c:265 +#: ../glib/gregex.c:332 msgid "\\c at end of pattern" msgstr "\\c ĉe fino de modelo" -#: ../glib/gregex.c:268 -msgid "unrecognized character follows \\" +#: ../glib/gregex.c:335 +#, fuzzy +#| msgid "unrecognized character follows \\" +msgid "unrecognized character following \\" msgstr "nerekonata karaktro sekvas \\" -#: ../glib/gregex.c:275 -msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here" -msgstr "" -"kodÅanÄaj sekvencoj kiuj ÅanÄas usklecon (\\l, \\L, \\u, \\U) ne estas " -"permesi ĉi tie" - -#: ../glib/gregex.c:278 +#: ../glib/gregex.c:338 msgid "numbers out of order in {} quantifier" msgstr "nombroj neordigitaj en {} kvantoro" -#: ../glib/gregex.c:281 +#: ../glib/gregex.c:341 msgid "number too big in {} quantifier" msgstr "nombro tro granda en {} kvantoro" -#: ../glib/gregex.c:284 +#: ../glib/gregex.c:344 msgid "missing terminating ] for character class" -msgstr "Mankas finiga ] por karaktro-klaso" +msgstr "mankas finiga ] por karaktro-klaso" -#: ../glib/gregex.c:287 +#: ../glib/gregex.c:347 msgid "invalid escape sequence in character class" -msgstr "Nevalida kodÅanÄa sekvenco en karaktro-klaso" +msgstr "nevalida kodÅanÄa sekvenco en karaktro-klaso" -#: ../glib/gregex.c:290 +#: ../glib/gregex.c:350 msgid "range out of order in character class" msgstr "intervalo ne ordigita en karaktro-klaso" -#: ../glib/gregex.c:293 +#: ../glib/gregex.c:353 msgid "nothing to repeat" msgstr "nenio ripetebla" -#: ../glib/gregex.c:296 -msgid "unrecognized character after (?" -msgstr "nekonata karaktro post (?" - -#: ../glib/gregex.c:300 -msgid "unrecognized character after (?<" -msgstr "nekonata karaktro post (?<" +#: ../glib/gregex.c:357 +msgid "unexpected repeat" +msgstr "neatendita ripeto" -#: ../glib/gregex.c:304 -msgid "unrecognized character after (?P" -msgstr "nekonata karaktro post (?P" +#: ../glib/gregex.c:360 +#| msgid "unrecognized character after (?" +msgid "unrecognized character after (? or (?-" +msgstr "nekonata karaktro post (? aÅ (?-" -#: ../glib/gregex.c:307 +#: ../glib/gregex.c:363 msgid "POSIX named classes are supported only within a class" msgstr "POSIX nomitaj klasoj estas subtenataj nur ene de klaso" -#: ../glib/gregex.c:310 +#: ../glib/gregex.c:366 msgid "missing terminating )" msgstr "mankas finiga )" -#: ../glib/gregex.c:314 -msgid ") without opening (" -msgstr ") sen komenca (" - -#. translators: '(?R' and '(?[+-]digits' are both meant as (groups of) -#. * sequences here, '(?-54' would be an example for the second group. -#. -#: ../glib/gregex.c:321 -msgid "(?R or (?[+-]digits must be followed by )" -msgstr "(?R aÅ (?[+-]ciferoj devas esti sekvataj de )" - -#: ../glib/gregex.c:324 +#: ../glib/gregex.c:369 msgid "reference to non-existent subpattern" msgstr "referenco al ne ekzistanta submodelo" -#: ../glib/gregex.c:327 +#: ../glib/gregex.c:372 msgid "missing ) after comment" msgstr "manka ) post komento" -#: ../glib/gregex.c:330 -msgid "regular expression too large" +#: ../glib/gregex.c:375 +#, fuzzy +#| msgid "regular expression too large" +msgid "regular expression is too large" msgstr "regula esprima tro granda" -#: ../glib/gregex.c:333 +#: ../glib/gregex.c:378 msgid "failed to get memory" msgstr "malsukcesis akiri memoron" -#: ../glib/gregex.c:336 +#: ../glib/gregex.c:382 +msgid ") without opening (" +msgstr ") sen komenca (" + +#: ../glib/gregex.c:386 +msgid "code overflow" +msgstr "koda troo" + +#: ../glib/gregex.c:390 +msgid "unrecognized character after (?<" +msgstr "nekonata karaktro post (?<" + +#: ../glib/gregex.c:393 msgid "lookbehind assertion is not fixed length" msgstr "retrorigarda aserto ne havas fiksitan longon" -#: ../glib/gregex.c:339 +#: ../glib/gregex.c:396 msgid "malformed number or name after (?(" msgstr "misformata nombro aÅ nomo post (?(" -#: ../glib/gregex.c:342 +#: ../glib/gregex.c:399 msgid "conditional group contains more than two branches" msgstr "kondiĉa grupo havas pli ol du branĉigojn" -#: ../glib/gregex.c:345 +#: ../glib/gregex.c:402 msgid "assertion expected after (?(" msgstr "aserto atendata post (?(" -#: ../glib/gregex.c:348 +#. translators: '(?R' and '(?[+-]digits' are both meant as (groups of) +#. * sequences here, '(?-54' would be an example for the second group. +#. +#: ../glib/gregex.c:409 +msgid "(?R or (?[+-]digits must be followed by )" +msgstr "(?R aÅ (?[+-]ciferoj devas esti sekvataj de )" + +#: ../glib/gregex.c:412 msgid "unknown POSIX class name" msgstr "nekonata POSIX klasnomo" -#: ../glib/gregex.c:351 +#: ../glib/gregex.c:415 msgid "POSIX collating elements are not supported" msgstr "POSIX kunmetigaj elementoj ne estas subtenataj" -#: ../glib/gregex.c:354 +#: ../glib/gregex.c:418 msgid "character value in \\x{...} sequence is too large" msgstr "karaktro-valoro en \\x{...} sekvenco estas tro granda" -#: ../glib/gregex.c:357 +#: ../glib/gregex.c:421 msgid "invalid condition (?(0)" -msgstr "Nevalida kondiĉo (?(0)" +msgstr "nevalida kondiĉo (?(0)" -#: ../glib/gregex.c:360 +#: ../glib/gregex.c:424 msgid "\\C not allowed in lookbehind assertion" msgstr "\\C ne estas permesata en retrorigarda aserto" -#: ../glib/gregex.c:363 +#: ../glib/gregex.c:431 +msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported" +msgstr "" + +#: ../glib/gregex.c:434 msgid "recursive call could loop indefinitely" msgstr "rikura voko povus iteracii senfine" -#: ../glib/gregex.c:366 +#: ../glib/gregex.c:438 +msgid "unrecognized character after (?P" +msgstr "nekonata karaktro post (?P" + +#: ../glib/gregex.c:441 msgid "missing terminator in subpattern name" msgstr "manka finilo en submodela nomo" -#: ../glib/gregex.c:369 +#: ../glib/gregex.c:444 msgid "two named subpatterns have the same name" msgstr "du nomitaj submodeloj havas la saman nomon" -#: ../glib/gregex.c:372 +#: ../glib/gregex.c:447 msgid "malformed \\P or \\p sequence" msgstr "misformita \\P aÅ \\p sekvenco" -#: ../glib/gregex.c:375 +#: ../glib/gregex.c:450 msgid "unknown property name after \\P or \\p" msgstr "nekonata eco-nomo post \\P aÅ \\p" -#: ../glib/gregex.c:378 +#: ../glib/gregex.c:453 msgid "subpattern name is too long (maximum 32 characters)" msgstr "submodela nomo estas tro longa (maksimume 32 karaktroj)" -#: ../glib/gregex.c:381 +#: ../glib/gregex.c:456 msgid "too many named subpatterns (maximum 10,000)" msgstr "tro multaj nomitaj submodeloj (maksimume 10.000)" -#: ../glib/gregex.c:384 +#: ../glib/gregex.c:459 msgid "octal value is greater than \\377" msgstr "okuma valoro estas pli granda ol \\377" -#: ../glib/gregex.c:387 +#: ../glib/gregex.c:463 +msgid "overran compiling workspace" +msgstr "troplenigis kompilada laborspaco" + +#: ../glib/gregex.c:467 +msgid "previously-checked referenced subpattern not found" +msgstr "antaÅe kontrolita referencita submodelo ne trovita" + +#: ../glib/gregex.c:470 msgid "DEFINE group contains more than one branch" msgstr "DIFINI grupo havas pli ol unu branĉo" -#: ../glib/gregex.c:390 -msgid "repeating a DEFINE group is not allowed" -msgstr "ripeto de DIFIN-grupo ne estas permesata" - -#: ../glib/gregex.c:393 +#: ../glib/gregex.c:473 msgid "inconsistent NEWLINE options" msgstr "nekoheraj NOVLINIO-j opcioj" -#: ../glib/gregex.c:396 +#: ../glib/gregex.c:476 +#, fuzzy +#| msgid "" +#| "\\g is not followed by a braced name or an optionally braced non-zero " +#| "number" msgid "" -"\\g is not followed by a braced name or an optionally braced non-zero number" +"\\g is not followed by a braced, angle-bracketed, or quoted name or number, " +"or by a plain number" msgstr "" "\\g ne estas sekvata de nomo inter kunigaj krampoj, aÅ de nenula nombro " "malnepre en kunigaj krampoj" -#: ../glib/gregex.c:401 -msgid "unexpected repeat" -msgstr "neatendita ripeto" +#: ../glib/gregex.c:480 +msgid "a numbered reference must not be zero" +msgstr "" -#: ../glib/gregex.c:405 -msgid "code overflow" -msgstr "koda troo" +#: ../glib/gregex.c:483 +msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" +msgstr "" -#: ../glib/gregex.c:409 -msgid "overran compiling workspace" -msgstr "troplenigis kompilada laborspaco" +#: ../glib/gregex.c:486 +msgid "(*VERB) not recognized" +msgstr "" -#: ../glib/gregex.c:413 -msgid "previously-checked referenced subpattern not found" -msgstr "antaÅe kontrolita referencita submodelo ne trovita" +#: ../glib/gregex.c:489 +msgid "number is too big" +msgstr "" + +#: ../glib/gregex.c:492 +#, fuzzy +#| msgid "missing terminator in subpattern name" +msgid "missing subpattern name after (?&" +msgstr "manka finilo en submodela nomo post (?&" -#: ../glib/gregex.c:631 ../glib/gregex.c:1753 +#: ../glib/gregex.c:495 +#, fuzzy +#| msgid "digit expected" +msgid "digit expected after (?+" +msgstr "cifero atendata post (?+" + +#: ../glib/gregex.c:498 +msgid "] is an invalid data character in JavaScript compatibility mode" +msgstr "" + +#: ../glib/gregex.c:501 +#, fuzzy +#| msgid "two named subpatterns have the same name" +msgid "different names for subpatterns of the same number are not allowed" +msgstr "du nomitaj submodeloj havas la saman nomon" + +#: ../glib/gregex.c:504 +msgid "(*MARK) must have an argument" +msgstr "" + +#: ../glib/gregex.c:507 +msgid "\\c must be followed by an ASCII character" +msgstr "" + +#: ../glib/gregex.c:510 +#, fuzzy +#| msgid "" +#| "\\g is not followed by a braced name or an optionally braced non-zero " +#| "number" +msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" +msgstr "" +"\\g ne estas sekvata de nomo inter kunigaj krampoj, aÅ de nenula nombro " +"malnepre en kunigaj krampoj" + +#: ../glib/gregex.c:513 +#| msgid "URIs not supported" +msgid "\\N is not supported in a class" +msgstr "\\N ne estas subtenataj en klaso" + +#: ../glib/gregex.c:516 +msgid "too many forward references" +msgstr "" + +#: ../glib/gregex.c:519 +msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" +msgstr "" + +#: ../glib/gregex.c:522 +#| msgid "character value in \\x{...} sequence is too large" +msgid "character value in \\u.... sequence is too large" +msgstr "karaktro-valoro en \\u.... sekvenco estas tro granda" + +#: ../glib/gregex.c:745 ../glib/gregex.c:1977 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "Eraro dum kongruado de regula esprimo %s: %s" -#: ../glib/gregex.c:1206 +#: ../glib/gregex.c:1316 msgid "PCRE library is compiled without UTF8 support" msgstr "PCRE-biblioteko estas kompilata sen UTF8-subteno" -#: ../glib/gregex.c:1215 +#: ../glib/gregex.c:1320 msgid "PCRE library is compiled without UTF8 properties support" msgstr "PCRE-biblioteko estas kompilata sen UTF8-ecoj-subteno" -#: ../glib/gregex.c:1271 -#, c-format -msgid "Error while compiling regular expression %s at char %d: %s" -msgstr "Eraro dum kompilo de regula esprimo %s ĉe karaktro %d: %s" +#: ../glib/gregex.c:1328 +#, fuzzy +#| msgid "PCRE library is compiled without UTF8 properties support" +msgid "PCRE library is compiled with incompatible options" +msgstr "PCRE-biblioteko estas kompilata sen nekongruaj opcioj" -#: ../glib/gregex.c:1307 +#: ../glib/gregex.c:1357 #, c-format msgid "Error while optimizing regular expression %s: %s" msgstr "Eraro dum optimumigo de regula esprimo %s: %s" -#: ../glib/gregex.c:2182 -msgid "hexadecimal digit or '}' expected" +#: ../glib/gregex.c:1437 +#, c-format +msgid "Error while compiling regular expression %s at char %d: %s" +msgstr "Eraro dum kompilo de regula esprimo %s ĉe karaktro %d: %s" + +#: ../glib/gregex.c:2413 +#, fuzzy +#| msgid "hexadecimal digit or '}' expected" +msgid "hexadecimal digit or “}†expected" msgstr "deksusuma cifero aÅ '}' atendata" -#: ../glib/gregex.c:2198 +#: ../glib/gregex.c:2429 msgid "hexadecimal digit expected" msgstr "deksesuma cifero atendata" -#: ../glib/gregex.c:2238 -msgid "missing '<' in symbolic reference" +#: ../glib/gregex.c:2469 +#, fuzzy +#| msgid "missing '<' in symbolic reference" +msgid "missing “<†in symbolic reference" msgstr "mankas '<' en simbola referenco" -#: ../glib/gregex.c:2247 +#: ../glib/gregex.c:2478 msgid "unfinished symbolic reference" -msgstr "Nefinita simbola referenco" +msgstr "nefinita simbola referenco" -#: ../glib/gregex.c:2254 +#: ../glib/gregex.c:2485 msgid "zero-length symbolic reference" msgstr "nulo-longa simbola referenco" -#: ../glib/gregex.c:2265 +#: ../glib/gregex.c:2496 msgid "digit expected" msgstr "cifero atendata" -#: ../glib/gregex.c:2283 +#: ../glib/gregex.c:2514 msgid "illegal symbolic reference" msgstr "malpermesita simbola referenco" -#: ../glib/gregex.c:2345 -msgid "stray final '\\'" +#: ../glib/gregex.c:2576 +#, fuzzy +#| msgid "stray final '\\'" +msgid "stray final “\\â€" msgstr "ne bezonata fina '\\'" -#: ../glib/gregex.c:2349 +#: ../glib/gregex.c:2580 msgid "unknown escape sequence" msgstr "nekonata kodÅanÄa sekvenco" -#: ../glib/gregex.c:2359 -#, c-format -msgid "Error while parsing replacement text \"%s\" at char %lu: %s" +#: ../glib/gregex.c:2590 +#, fuzzy, 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 "" "Eraro dum sintaksa analizo de anstataÅa teksto \"%s\" ĉe karaktro %lu: %s" -#: ../glib/gshell.c:91 -msgid "Quoted text doesn't begin with a quotation mark" +#: ../glib/gshell.c:94 +#, fuzzy +#| msgid "Quoted text doesn't begin with a quotation mark" +msgid "Quoted text doesn’t begin with a quotation mark" msgstr "Citata teksto ne komenciÄas per citilo" -#: ../glib/gshell.c:181 +#: ../glib/gshell.c:184 msgid "Unmatched quotation mark in command line or other shell-quoted text" msgstr "Ne kongrua citilo sur komanda linio aÅ alia teksto citis en Åelo" -#: ../glib/gshell.c:559 -#, c-format -msgid "Text ended just after a '\\' character. (The text was '%s')" +#: ../glib/gshell.c:580 +#, fuzzy, c-format +#| msgid "Text ended just after a '\\' character. (The text was '%s')" +msgid "Text ended just after a “\\†character. (The text was “%sâ€)" msgstr "Teksto finiÄis post '\\' karaktron. (La teksto estis '%s')" -#: ../glib/gshell.c:566 -#, c-format -msgid "Text ended before matching quote was found for %c. (The text was '%s')" +#: ../glib/gshell.c:587 +#, fuzzy, c-format +#| msgid "" +#| "Text ended before matching quote was found for %c. (The text was '%s')" +msgid "Text ended before matching quote was found for %c. (The text was “%sâ€)" msgstr "" "Teksto finiÄis antaÅ kongrua citilo por %c estis trovita. (La teksto estis " "'%s')" -#: ../glib/gshell.c:578 +#: ../glib/gshell.c:599 msgid "Text was empty (or contained only whitespace)" msgstr "Teksto estis malplena (aÅ havis nur blankspacon)" -#: ../glib/gspawn.c:208 +#: ../glib/gspawn.c:250 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Malsukcesis legi datumaron de procezido (%s)" -#: ../glib/gspawn.c:348 +#: ../glib/gspawn.c:394 #, c-format msgid "Unexpected error in select() reading data from a child process (%s)" msgstr "Neatendita eraro en select() dum datumlegado de procezido (%s)" -#: ../glib/gspawn.c:433 +#: ../glib/gspawn.c:479 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Neatendita eraro en waitpid() (%s)" -#: ../glib/gspawn.c:1174 ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346 +#: ../glib/gspawn.c:886 ../glib/gspawn-win32.c:1231 +#, c-format +msgid "Child process exited with code %ld" +msgstr "" + +#: ../glib/gspawn.c:894 +#, c-format +msgid "Child process killed by signal %ld" +msgstr "" + +#: ../glib/gspawn.c:901 +#, c-format +msgid "Child process stopped by signal %ld" +msgstr "" + +#: ../glib/gspawn.c:908 +#, c-format +msgid "Child process exited abnormally" +msgstr "" + +#: ../glib/gspawn.c:1313 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Malsukcesis legi de duktido (%s)" -#: ../glib/gspawn.c:1241 +#: ../glib/gspawn.c:1383 #, c-format msgid "Failed to fork (%s)" msgstr "Malsukcesis branĉiÄi (%s)" -#: ../glib/gspawn.c:1387 ../glib/gspawn-win32.c:369 -#, c-format -msgid "Failed to change to directory '%s' (%s)" +#: ../glib/gspawn.c:1532 ../glib/gspawn-win32.c:368 +#, fuzzy, c-format +#| msgid "Failed to change to directory '%s' (%s)" +msgid "Failed to change to directory “%s†(%s)" msgstr "Malsukcesis ÅanÄi al dosierujo '%s' (%s)" -#: ../glib/gspawn.c:1397 -#, c-format -msgid "Failed to execute child process \"%s\" (%s)" +#: ../glib/gspawn.c:1542 +#, fuzzy, c-format +#| msgid "Failed to execute child process \"%s\" (%s)" +msgid "Failed to execute child process “%s†(%s)" msgstr "Malsukcesis plenumi procezidon \"%s\" (%s)" -#: ../glib/gspawn.c:1407 +#: ../glib/gspawn.c:1552 #, c-format msgid "Failed to redirect output or input of child process (%s)" msgstr "Malsukcesis alidirektigi enigon aÅ eligon de procezido (%s)" -#: ../glib/gspawn.c:1416 +#: ../glib/gspawn.c:1561 #, c-format msgid "Failed to fork child process (%s)" msgstr "Malsukcesis branĉiÄi procezidon (%s)" -#: ../glib/gspawn.c:1424 -#, c-format -msgid "Unknown error executing child process \"%s\"" +#: ../glib/gspawn.c:1569 +#, fuzzy, c-format +#| msgid "Unknown error executing child process \"%s\"" +msgid "Unknown error executing child process “%sâ€" msgstr "Nekonata eraro dum plenumanta de la procezido \"%s\"" -#: ../glib/gspawn.c:1448 +#: ../glib/gspawn.c:1593 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Malsukcesis legi sufiĉe datumaron de pid-duktido (%s)" -#: ../glib/gspawn.c:1521 ../glib/gspawn-win32.c:299 +#: ../glib/gspawn-win32.c:281 +msgid "Failed to read data from child process" +msgstr "Malsukesis legi datumaron de procezido" + +#: ../glib/gspawn-win32.c:298 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "Malsukcesis krei dukton por komunikado kun procezido (%s)" -#: ../glib/gspawn-win32.c:282 -msgid "Failed to read data from child process" -msgstr "Malsukesis legi datumaron de procezido" - -#: ../glib/gspawn-win32.c:375 ../glib/gspawn-win32.c:494 +#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493 #, c-format msgid "Failed to execute child process (%s)" msgstr "Malsukcesis plenumi procezidon (%s)" -#: ../glib/gspawn-win32.c:444 +#: ../glib/gspawn-win32.c:443 #, c-format msgid "Invalid program name: %s" msgstr "Nevalida programa nomo: %s" -#: ../glib/gspawn-win32.c:454 ../glib/gspawn-win32.c:722 -#: ../glib/gspawn-win32.c:1278 +#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "Nevalida ĉeno en argument-vektoro ĉe %d: %s" -#: ../glib/gspawn-win32.c:465 ../glib/gspawn-win32.c:737 -#: ../glib/gspawn-win32.c:1311 +#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735 #, c-format msgid "Invalid string in environment: %s" msgstr "Nevalida ĉeno en medio: %s" -#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1259 +#: ../glib/gspawn-win32.c:716 #, c-format msgid "Invalid working directory: %s" msgstr "Nevalida kuranta dosierujo: %s" -#: ../glib/gspawn-win32.c:783 +#: ../glib/gspawn-win32.c:781 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Malsukcesis plenumi helpan programon (%s)" -#: ../glib/gspawn-win32.c:997 +#: ../glib/gspawn-win32.c:995 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" @@ -4096,99 +5657,201 @@ msgstr "" "Neatendita eraro dum g_io_channel_win32_poll() legado de datumaro de " "procezido" -#: ../glib/gutf8.c:915 +#: ../glib/gstrfuncs.c:3237 ../glib/gstrfuncs.c:3338 +msgid "Empty string is not a number" +msgstr "" + +#: ../glib/gstrfuncs.c:3261 +#, c-format +#| msgid "'%s' is not a valid name " +msgid "“%s†is not a signed number" +msgstr "“%s†ne estas valida numero" + +#: ../glib/gstrfuncs.c:3271 ../glib/gstrfuncs.c:3374 +#, c-format +msgid "Number “%s†is out of bounds [%s, %s]" +msgstr "" + +#: ../glib/gstrfuncs.c:3364 +#, c-format +#| msgid "'%s' is not a valid name " +msgid "“%s†is not an unsigned number" +msgstr "“%s†ne estas valida numero" + +#: ../glib/gutf8.c:798 +#| msgid "failed to get memory" +msgid "Failed to allocate memory" +msgstr "Malsukcesis akiri memoron" + +#: ../glib/gutf8.c:931 msgid "Character out of range for UTF-8" msgstr "Karaktro estas ekster la intervalo de UTF-8" -#: ../glib/gutf8.c:1015 ../glib/gutf8.c:1024 ../glib/gutf8.c:1154 -#: ../glib/gutf8.c:1163 ../glib/gutf8.c:1302 ../glib/gutf8.c:1398 +#: ../glib/gutf8.c:1032 ../glib/gutf8.c:1041 ../glib/gutf8.c:1171 +#: ../glib/gutf8.c:1180 ../glib/gutf8.c:1319 ../glib/gutf8.c:1416 msgid "Invalid sequence in conversion input" msgstr "Nevalida sekvenco en konverta enigo" -#: ../glib/gutf8.c:1313 ../glib/gutf8.c:1409 +#: ../glib/gutf8.c:1330 ../glib/gutf8.c:1427 msgid "Character out of range for UTF-16" msgstr "Karaktro estas ekster la intervalo de UTF-16" -#: ../glib/gutils.c:2166 ../glib/gutils.c:2193 ../glib/gutils.c:2297 +#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u bajto" msgstr[1] "%u bajtoj" -#: ../glib/gutils.c:2172 +#: ../glib/gutils.c:2145 #, c-format msgid "%.1f KiB" msgstr "%.1f KiB" -#: ../glib/gutils.c:2174 +#: ../glib/gutils.c:2147 #, c-format msgid "%.1f MiB" msgstr "%.1f MiB" -#: ../glib/gutils.c:2177 +#: ../glib/gutils.c:2150 #, c-format msgid "%.1f GiB" msgstr "%.1f GiB" -#: ../glib/gutils.c:2180 +#: ../glib/gutils.c:2153 #, c-format msgid "%.1f TiB" msgstr "%.1f TiB" -#: ../glib/gutils.c:2183 +#: ../glib/gutils.c:2156 #, c-format msgid "%.1f PiB" msgstr "%.1f PiB" -#: ../glib/gutils.c:2186 +#: ../glib/gutils.c:2159 #, c-format msgid "%.1f EiB" msgstr "%.1f EiB" -#: ../glib/gutils.c:2199 +#: ../glib/gutils.c:2172 #, c-format msgid "%.1f kB" msgstr "%.1f kB" -#: ../glib/gutils.c:2202 ../glib/gutils.c:2310 +#: ../glib/gutils.c:2175 ../glib/gutils.c:2290 #, c-format msgid "%.1f MB" msgstr "%.1f MB" -#: ../glib/gutils.c:2205 ../glib/gutils.c:2315 +#: ../glib/gutils.c:2178 ../glib/gutils.c:2295 #, c-format msgid "%.1f GB" msgstr "%.1f GB" -#: ../glib/gutils.c:2207 ../glib/gutils.c:2320 +#: ../glib/gutils.c:2180 ../glib/gutils.c:2300 #, c-format msgid "%.1f TB" msgstr "%.1f TB" -#: ../glib/gutils.c:2210 ../glib/gutils.c:2325 +#: ../glib/gutils.c:2183 ../glib/gutils.c:2305 #, c-format msgid "%.1f PB" msgstr "%.1f PB" -#: ../glib/gutils.c:2213 ../glib/gutils.c:2330 +#: ../glib/gutils.c:2186 ../glib/gutils.c:2310 #, c-format msgid "%.1f EB" msgstr "%.1f EB" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: ../glib/gutils.c:2250 +#: ../glib/gutils.c:2223 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s bajto" msgstr[1] "%s bajtoj" -#: ../glib/gutils.c:2305 +#. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to +#. * mean 1024 bytes. I am aware that 'KB' is not correct, but it has been preserved for reasons of +#. * compatibility. Users will not see this string unless a program is using this deprecated function. +#. * Please translate as literally as possible. +#. +#: ../glib/gutils.c:2285 #, c-format msgid "%.1f KB" msgstr "%.1f KB" +#~ msgid "Abnormal program termination spawning command line '%s': %s" +#~ msgstr "Nenormala programfiniÄo dum starto de komanda linio '%s': %s" + +#~ msgid "Command line '%s' exited with non-zero exit status %d: %s" +#~ msgstr "Komanda linio '%s' elirinta kun nenula elira kodo %d: %s" + +#~ msgid "No such interface" +#~ msgstr "Neniu tia interfaco" + +#~| msgid "Error setting symlink: file is not a symlink" +#~ msgid "Error processing input file with xmllint" +#~ msgstr "Eraro dum traktado de enig-dosiero per 'xmllint'" + +#~ msgid "Unable to find default local directory monitor type" +#~ msgstr "Ne eblas trovi defaÅltan tipon de loka dosieruja kontrolado" + +#~ msgid "Error renaming file: %s" +#~ msgstr "Eraro dum alinomo de la dosiero: %s" + +#~ msgid "Error opening file: %s" +#~ msgstr "Eraro dum malfermo de la dosiero: %s" + +#~ msgid "Error creating directory: %s" +#~ msgstr "Eraro dum kreo de la dosierujo: %s" + +#~ msgid "No service record for '%s'" +#~ msgstr "Ne ekzistas servorikordo por '%s'" + +#~ msgid "" +#~ "Unexpected option length while checking if SO_PASSCRED is enabled for " +#~ "socket. Expected %d bytes, got %d" +#~ msgstr "" +#~ "Neatendita opciolongo dum kontrolanta ĉu SO_PASSCRED estas enÅaltita por " +#~ "kontaktskatolo. Atendita %d bajtoj, akiras %d" + +#~ msgid "Error launching application: %s" +#~ msgstr "Eraro dum lanĉo de la aplikaĵo: %s" + +#~ msgid "association changes not supported on win32" +#~ msgstr "asociigaj ÅanÄoj ne subtenitaj en vin32" + +#~ msgid "Association creation not supported on win32" +#~ msgstr "Asociiga kreado ne subtenita en win32" + +#~ msgid "Error reading file '%s': %s" +#~ msgstr "Eraro dum legado de la dosiero '%s': %s" + +#~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s" +#~ msgstr "" +#~ "Malsukcesis malfermi dosieron '%s' por skribi: fdopen() malsukcesis: %s" + +#~ msgid "Failed to write file '%s': fflush() failed: %s" +#~ msgstr "Skribi dosieron malsukcesis '%s': fflush() malsukcesis: %s" + +#~ msgid "Failed to close file '%s': fclose() failed: %s" +#~ msgstr "Malsukcesis fermi dosieron '%s': fclose() malsukcesis: %s" + +#~ msgid "Key file does not have key '%s'" +#~ msgstr "Åœlosilodosiero ne havas Ålosilon '%s'" + +#~ msgid "workspace limit for empty substrings reached" +#~ msgstr "laborspaca limo por malplenaj subĉenoj estas atingitaj" + +#~ msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here" +#~ msgstr "" +#~ "kodÅanÄaj sekvencoj kiuj ÅanÄas usklecon (\\l, \\L, \\u, \\U) ne estas " +#~ "permesi ĉi tie" + +#~ msgid "repeating a DEFINE group is not allowed" +#~ msgstr "ripeto de DIFIN-grupo ne estas permesata" + #~ msgid "File is empty" #~ msgstr "Dosiero estas malplena" @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: glib.master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-04-19 20:54+0000\n" -"PO-Revision-Date: 2017-04-26 10:15+0200\n" +"POT-Creation-Date: 2017-06-02 16:12+0000\n" +"PO-Revision-Date: 2017-06-05 16:09+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: es <gnome-es-list@gnome.org>\n" "Language: es\n" @@ -26,21 +26,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.6\n" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "GApplication options" msgstr "Opciones de GApplication" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "Show GApplication options" msgstr "Mostrar las opciones de GApplication" -#: ../gio/gapplication.c:538 +#: ../gio/gapplication.c:535 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" "Entrar en modo de servicio de GApplication (usar desde archivos de servicio " "de D-Bus)" -#: ../gio/gapplication.c:550 +#: ../gio/gapplication.c:547 msgid "Override the application’s ID" msgstr "Omitir el ID de la aplicación" @@ -295,7 +295,7 @@ msgid "Truncate not supported on base stream" msgstr "No se soporta el truncado en el flujo base" #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 -#: ../gio/gdbusprivate.c:1379 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 #: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" @@ -542,7 +542,7 @@ msgstr "" "No se puede determinar la dirección del bus desde la variable de entorno " "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida" -#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7156 +#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7155 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -658,7 +658,7 @@ msgid "(Additionally, releasing the lock for “%s†also failed: %s) " msgstr "" "(Adicionalmente, también falló la liberación del bloqueo para «%s»: %s)" -#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 +#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378 msgid "The connection is closed" msgstr "La conexión está cerrada" @@ -666,14 +666,14 @@ msgstr "La conexión está cerrada" msgid "Timeout was reached" msgstr "Se alcanzó el tiempo de expiración" -#: ../gio/gdbusconnection.c:2499 +#: ../gio/gdbusconnection.c:2500 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" "Se encontraron opciones no soportadas al construir la conexión del lado del " "cliente" -#: ../gio/gdbusconnection.c:4123 ../gio/gdbusconnection.c:4470 +#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471 #, c-format msgid "" "No such interface 'org.freedesktop.DBus.Properties' on object at path %s" @@ -681,80 +681,80 @@ msgstr "" "No existe la interfaz «org.freedesktop.DBus.Properties» en el objeto en la " "ruta %s" -#: ../gio/gdbusconnection.c:4265 +#: ../gio/gdbusconnection.c:4266 #, c-format msgid "No such property '%s'" msgstr "No existe la propiedad «%s»" -#: ../gio/gdbusconnection.c:4277 +#: ../gio/gdbusconnection.c:4278 #, c-format msgid "Property '%s' is not readable" msgstr "No se puede leer la clave «%s»" -#: ../gio/gdbusconnection.c:4288 +#: ../gio/gdbusconnection.c:4289 #, c-format msgid "Property '%s' is not writable" msgstr "No se puede escribir la clave «%s»" -#: ../gio/gdbusconnection.c:4308 +#: ../gio/gdbusconnection.c:4309 #, c-format msgid "Error setting property '%s': Expected type '%s' but got '%s'" msgstr "" "Error al establecer la propiedad «%s». Se esperaba el tipo «%s» pero se " "obtuvo «%s»." -#: ../gio/gdbusconnection.c:4413 ../gio/gdbusconnection.c:4621 -#: ../gio/gdbusconnection.c:6587 +#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 +#: ../gio/gdbusconnection.c:6586 #, c-format msgid "No such interface '%s'" msgstr "La interfaz «%s» no existe" -#: ../gio/gdbusconnection.c:4839 ../gio/gdbusconnection.c:7096 +#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" msgstr "No existe la interfaz «%s» en el objeto en la ruta %s" -#: ../gio/gdbusconnection.c:4937 +#: ../gio/gdbusconnection.c:4938 #, c-format msgid "No such method '%s'" msgstr "No existe el método «%s»" -#: ../gio/gdbusconnection.c:4968 +#: ../gio/gdbusconnection.c:4969 #, c-format msgid "Type of message, '%s', does not match expected type '%s'" msgstr "El tipo de mensaje, «%s», no concide con el tipo esperado «%s»" -#: ../gio/gdbusconnection.c:5166 +#: ../gio/gdbusconnection.c:5167 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "Ya existe un objeto exportado para la interfaz %s en %s" -#: ../gio/gdbusconnection.c:5392 +#: ../gio/gdbusconnection.c:5393 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "No se pudo obtener la propiedad %s.%s" -#: ../gio/gdbusconnection.c:5448 +#: ../gio/gdbusconnection.c:5449 #, c-format msgid "Unable to set property %s.%s" msgstr "No se pudo establecer la propiedad %s.%s" -#: ../gio/gdbusconnection.c:5624 +#: ../gio/gdbusconnection.c:5625 #, c-format msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "El método «%s» devolvió el tipo «%s» pero se esperaba «%s»" -#: ../gio/gdbusconnection.c:6698 +#: ../gio/gdbusconnection.c:6697 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "El método «%s» con interfaz «%s» y firma «%s» no existe" -#: ../gio/gdbusconnection.c:6819 +#: ../gio/gdbusconnection.c:6818 #, c-format msgid "A subtree is already exported for %s" msgstr "Ya se ha exportado un subárbol para %s" -#: ../gio/gdbusconnection.c:7147 +#: ../gio/gdbusconnection.c:7146 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -763,28 +763,28 @@ msgstr "" "No se puede determinar la dirección del bus desde la variable de entorno " "DBUS_STARTER_BUS_TYPE; variable «%s» desconocida" -#: ../gio/gdbusmessage.c:1244 +#: ../gio/gdbusmessage.c:1246 msgid "type is INVALID" msgstr "el tipo no es válido («INVALID»)" -#: ../gio/gdbusmessage.c:1255 +#: ../gio/gdbusmessage.c:1257 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "Mensaje de METHOD_CALL: falta el campo de cabecera PATH o MEMEBER" -#: ../gio/gdbusmessage.c:1266 +#: ../gio/gdbusmessage.c:1268 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "Mensaje de METHOD_RETURN: falta el campo de cabecera REPLY_SERIAL" -#: ../gio/gdbusmessage.c:1278 +#: ../gio/gdbusmessage.c:1280 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" "Mensaje de ERROR: falta el campo de cabecera REPLY_SERRIAL o ERROR_NAME" -#: ../gio/gdbusmessage.c:1291 +#: ../gio/gdbusmessage.c:1293 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "Mensaje de SIGNAL: falta el campo de cabecera PATH, INTERFACE o MEMBER" -#: ../gio/gdbusmessage.c:1299 +#: ../gio/gdbusmessage.c:1301 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" @@ -792,7 +792,7 @@ msgstr "" "Mensaje de SIGNAL: el campo de cabecera PATH está usando el valor reservado /" "org/freedesktop/DBus/Local" -#: ../gio/gdbusmessage.c:1307 +#: ../gio/gdbusmessage.c:1309 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" @@ -800,21 +800,21 @@ msgstr "" "Mensaje de SIGNAL: el campo de cabecera INTERFACE estaÌ usando el valor " "reservado org.freedesktop.DBus.Local" -#: ../gio/gdbusmessage.c:1355 ../gio/gdbusmessage.c:1415 +#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr[0] "Se querÃa leer %lu byte pero sólo se obtuvo %lu" msgstr[1] "Se querÃan leer %lu bytes pero sólo se obtuvo %lu" -#: ../gio/gdbusmessage.c:1369 +#: ../gio/gdbusmessage.c:1371 #, c-format msgid "Expected NUL byte after the string “%s†but found byte %d" msgstr "" "Se esperaba el byte NULL después de la cadena «%s» pero se encontró el byte " "%d" -#: ../gio/gdbusmessage.c:1388 +#: ../gio/gdbusmessage.c:1390 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " @@ -824,17 +824,17 @@ msgstr "" "en el byte desplazado %d (la longitud de la cadena es %d). La cadena UTF-8 " "válida hasta ese punto era «%s»." -#: ../gio/gdbusmessage.c:1587 +#: ../gio/gdbusmessage.c:1589 #, c-format msgid "Parsed value “%s†is not a valid D-Bus object path" msgstr "El valor analizado «%s» no es un objeto de ruta D-Bus válido" -#: ../gio/gdbusmessage.c:1609 +#: ../gio/gdbusmessage.c:1611 #, c-format msgid "Parsed value “%s†is not a valid D-Bus signature" msgstr "El valor analizado «%s» no es una firma de D-Bus válida" -#: ../gio/gdbusmessage.c:1656 +#: ../gio/gdbusmessage.c:1658 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -847,7 +847,7 @@ msgstr[1] "" "Se encontró un array de longitud %u bytes. La longitud máxima es 2<<26 bytes " "(64 MiB)." -#: ../gio/gdbusmessage.c:1676 +#: ../gio/gdbusmessage.c:1678 #, c-format msgid "" "Encountered array of type “a%câ€, expected to have a length a multiple of %u " @@ -856,13 +856,13 @@ msgstr "" "Encontrado un vector de tipo «a%c», esperando que su longitud fuese múltiplo " "de %u bytes, pero su longitud es de %u" -#: ../gio/gdbusmessage.c:1843 +#: ../gio/gdbusmessage.c:1845 #, c-format msgid "Parsed value “%s†for variant is not a valid D-Bus signature" msgstr "" "El valor analizado «%s» para la variante no es una firma de D-Bus válida" -#: ../gio/gdbusmessage.c:1867 +#: ../gio/gdbusmessage.c:1869 #, c-format msgid "" "Error deserializing GVariant with type string “%s†from the D-Bus wire format" @@ -870,7 +870,7 @@ msgstr "" "Error al deserializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" -#: ../gio/gdbusmessage.c:2051 +#: ../gio/gdbusmessage.c:2053 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“lâ€) or 0x42 (“Bâ€) but found value " @@ -879,27 +879,27 @@ msgstr "" "Valor endian no válido. Se esperaba 0x6c («l») o 0x42 («B»)» pero se obtuvo " "el valor 0x%02x" -#: ../gio/gdbusmessage.c:2064 +#: ../gio/gdbusmessage.c:2066 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" "La versión principal del protocolo no es válida. Se esperaba 1 pero se " "encontró %d." -#: ../gio/gdbusmessage.c:2120 +#: ../gio/gdbusmessage.c:2122 #, c-format msgid "Signature header with signature “%s†found but message body is empty" msgstr "" "Se encontró la cabecera de firma con firma «%s» pero el cuerpo del mensaje " "está vacÃo" -#: ../gio/gdbusmessage.c:2134 +#: ../gio/gdbusmessage.c:2136 #, c-format msgid "Parsed value “%s†is not a valid D-Bus signature (for body)" msgstr "" "El valor analizado «%s» no es una firma de D-Bus válida (para el cuerpo)" -#: ../gio/gdbusmessage.c:2164 +#: ../gio/gdbusmessage.c:2166 #, c-format msgid "No signature header in message but the message body is %u byte" msgid_plural "No signature header in message but the message body is %u bytes" @@ -910,11 +910,11 @@ msgstr[1] "" "No existe la cabecera de firma en el mensaje pero el cuerpo del mensaje " "tiene %u bytes" -#: ../gio/gdbusmessage.c:2174 +#: ../gio/gdbusmessage.c:2176 msgid "Cannot deserialize message: " msgstr "No se puede deserializar el mensaje: " -#: ../gio/gdbusmessage.c:2515 +#: ../gio/gdbusmessage.c:2517 #, c-format msgid "" "Error serializing GVariant with type string “%s†to the D-Bus wire format" @@ -922,7 +922,7 @@ msgstr "" "Error al serializar GVariant con el tipo de cadena «%s» al formato de " "mensaje de D-Bus" -#: ../gio/gdbusmessage.c:2652 +#: ../gio/gdbusmessage.c:2654 #, c-format msgid "" "Message has %d file descriptors but the header field indicates %d file " @@ -931,17 +931,17 @@ msgstr "" "El mensaje tiene %d descriptores de archivo pero el campo de cabecera indica " "%d descriptores de archivo" -#: ../gio/gdbusmessage.c:2660 +#: ../gio/gdbusmessage.c:2662 msgid "Cannot serialize message: " msgstr "No se puede serializar el mensaje: " -#: ../gio/gdbusmessage.c:2704 +#: ../gio/gdbusmessage.c:2706 #, c-format msgid "Message body has signature “%s†but there is no signature header" msgstr "" "El cuerpo del mensaje tiene la firma «%s» pero no existe la cabecera de firma" -#: ../gio/gdbusmessage.c:2714 +#: ../gio/gdbusmessage.c:2716 #, c-format msgid "" "Message body has type signature “%s†but signature in the header field is " @@ -950,28 +950,28 @@ msgstr "" "El cuerpo del mensaje tiene un tipo de firma «%s» pero la firma en el campo " "de cabecera es «%s»" -#: ../gio/gdbusmessage.c:2730 +#: ../gio/gdbusmessage.c:2732 #, c-format msgid "Message body is empty but signature in the header field is “(%s)â€" msgstr "" "El cuerpo del mensaje está vacÃo pero la firma en el campo de cabecera es " "«(%s)»" -#: ../gio/gdbusmessage.c:3283 +#: ../gio/gdbusmessage.c:3285 #, c-format msgid "Error return with body of type “%sâ€" msgstr "Error al devolver el cuerpo de tipo «%s»" -#: ../gio/gdbusmessage.c:3291 +#: ../gio/gdbusmessage.c:3293 msgid "Error return with empty body" msgstr "Error al devolver un cuepro vacÃo" -#: ../gio/gdbusprivate.c:2043 +#: ../gio/gdbusprivate.c:2066 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "No se pudo obtener el perfil de hardware: %s" -#: ../gio/gdbusprivate.c:2088 +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "No se puede cargar /var/lib/dbus/machine-id o /etc/machine-id: " @@ -1021,15 +1021,6 @@ msgstr "No se puede escuchar en un transporte no soportado «%s»" #: ../gio/gdbus-tool.c:95 #, c-format -#| msgid "" -#| "Commands:\n" -#| " help Shows this information\n" -#| " introspect Introspect a remote object\n" -#| " monitor Monitor a remote object\n" -#| " call Invoke a method on a remote object\n" -#| " emit Emit a signal\n" -#| "\n" -#| "Use “%s COMMAND --help†to get help on each command.\n" msgid "" "Commands:\n" " help Shows this information\n" @@ -1283,7 +1274,6 @@ msgstr "" "haya tiempo de expiración (predeterminado)" #: ../gio/gdbus-tool.c:2031 -#| msgid "[OPTION…]" msgid "[OPTION…] BUS-NAME" msgstr "[OPCIÓN…] NOMBRE-BUS" @@ -1293,62 +1283,58 @@ msgstr "Esperar a que aparezca el nombre del bus." #: ../gio/gdbus-tool.c:2109 #, c-format -#| msgid "Error: object path not specified.\n" msgid "Error: A service to activate for must be specified.\n" msgstr "Error: se debe especificar un servicio que activar.\n" #: ../gio/gdbus-tool.c:2114 #, c-format -#| msgid "Error: object path not specified.\n" msgid "Error: A service to wait for must be specified.\n" msgstr "Error: se debe especificar un servicio al que esperar.\n" #: ../gio/gdbus-tool.c:2119 #, c-format -#| msgid "Too many arguments" msgid "Error: Too many arguments.\n" msgstr "Demasiados argumentos.\n" #: ../gio/gdbus-tool.c:2127 ../gio/gdbus-tool.c:2134 #, c-format -#| msgid "Error: %s is not a valid bus name\n" msgid "Error: %s is not a valid well-known bus name.\n" msgstr "Error: %s no es un nombre de bus conocido válido\n" -#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 +#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533 msgid "Unnamed" msgstr "Sin nombre" -#: ../gio/gdesktopappinfo.c:2407 +#: ../gio/gdesktopappinfo.c:2411 msgid "Desktop file didn’t specify Exec field" msgstr "El archivo de escritorio no especificó el campo Exec" -#: ../gio/gdesktopappinfo.c:2692 +#: ../gio/gdesktopappinfo.c:2696 msgid "Unable to find terminal required for application" msgstr "Imposible encontrar el terminal requerido por la aplicación" -#: ../gio/gdesktopappinfo.c:3100 +#: ../gio/gdesktopappinfo.c:3129 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" "No se puede crear la carpeta de configuración de la aplicación %s del " "usuario: %s" -#: ../gio/gdesktopappinfo.c:3104 +#: ../gio/gdesktopappinfo.c:3133 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "No se puede crear la carpeta de configuración MIME %s del usuario: %s" -#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 +#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397 msgid "Application information lacks an identifier" msgstr "La información de la aplicación carece de un identificador" -#: ../gio/gdesktopappinfo.c:3602 +#: ../gio/gdesktopappinfo.c:3631 #, c-format msgid "Can’t create user desktop file %s" msgstr "No se puede crear el archivo de escritorio %s del usuario" -#: ../gio/gdesktopappinfo.c:3736 +#: ../gio/gdesktopappinfo.c:3765 #, c-format msgid "Custom definition for %s" msgstr "Definición personalizada para %s" @@ -1739,7 +1725,6 @@ msgstr "" "\n" #: ../gio/gio-tool-cat.c:80 -#| msgid "Error writing to file: %s" msgid "Error writing to stdout" msgstr "Error al escribir en la salida estándar" @@ -2022,7 +2007,6 @@ msgstr "No hay aplicaciones recomendadas\n" #: ../gio/gio-tool-mime.c:162 #, c-format -#| msgid "Failed to load info for handler “%sâ€\n" msgid "Failed to load info for handler “%sâ€" msgstr "Falló al cargar la información para el manejador «%s»" @@ -2132,7 +2116,6 @@ msgid "Show extra information" msgstr "Mostrar información adicional" #: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276 -#| msgid "Error mounting location: Anonymous access denied\n" msgid "Anonymous access denied" msgstr "Acceso anónimo denegado" @@ -2142,7 +2125,6 @@ msgid "Mounted %s at %s\n" msgstr "%s montado en %s\n" #: ../gio/gio-tool-mount.c:950 -#| msgid "No volume for device file %s\n" msgid "No volume for device file" msgstr "No hay volumen para el archivo de dispositivo" @@ -2242,7 +2224,6 @@ msgid "ETAG" msgstr "ETAG" #: ../gio/gio-tool-save.c:119 -#| msgid "Error reading from handle: %s" msgid "Error reading from standard input" msgstr "Error al leer de la entrada estándar" @@ -2294,7 +2275,6 @@ msgstr "Valor no especificado" #: ../gio/gio-tool-set.c:180 #, c-format -#| msgid "Invalid attribute type %s\n" msgid "Invalid attribute type “%sâ€" msgstr "Tipo de atributo «%s» no válido" @@ -3153,15 +3133,15 @@ msgstr "El flujo de origen ya está cerrado" msgid "Error resolving “%sâ€: %s" msgstr "Error al resolver «%s»: %s" -#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 -#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 -#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 +#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874 +#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143 +#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format msgid "The resource at “%s†does not exist" msgstr "El recurso en «%s» no existe" -#: ../gio/gresource.c:760 +#: ../gio/gresource.c:771 #, c-format msgid "The resource at “%s†failed to decompress" msgstr "El recurso en «%s» falló al descomprimir" @@ -3869,15 +3849,20 @@ msgstr "" "Esta es la última oportunidad para introducir la contraseña correctamente " "antes de que su acceso se bloquee." -#: ../gio/gtlspassword.c:113 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 +#| msgid "" +#| "Several password entered have been incorrect, and your access will be " +#| "locked out after further failures." msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" "Se han introducido varias contraseñas incorrectas, y su acceso se bloqueará " "después de más fallos." -#: ../gio/gtlspassword.c:115 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "La contraseña introducida no es correcta." @@ -3945,7 +3930,7 @@ msgstr "Error al leer del descriptor del archivo: %s" msgid "Error closing file descriptor: %s" msgstr "Error al cerrar el descriptor del archivo: %s" -#: ../gio/gunixmounts.c:2429 ../gio/gunixmounts.c:2482 +#: ../gio/gunixmounts.c:2422 ../gio/gunixmounts.c:2475 msgid "Filesystem root" msgstr "Sistema de archivos raÃz" @@ -4140,227 +4125,227 @@ msgid "The pathname “%s†is not an absolute path" msgstr "El nombre de la ruta «%s» no es una ruta absoluta" #. Translators: this is the preferred format for expressing the date and the time -#: ../glib/gdatetime.c:200 +#: ../glib/gdatetime.c:202 msgctxt "GDateTime" msgid "%a %b %e %H:%M:%S %Y" msgstr "%a %H:%M:%S, %e de %B de %Y" #. Translators: this is the preferred format for expressing the date -#: ../glib/gdatetime.c:203 +#: ../glib/gdatetime.c:205 msgctxt "GDateTime" msgid "%m/%d/%y" msgstr "%d/%m/%y" #. Translators: this is the preferred format for expressing the time -#: ../glib/gdatetime.c:206 +#: ../glib/gdatetime.c:208 msgctxt "GDateTime" msgid "%H:%M:%S" msgstr "%H:%M:%S" #. Translators: this is the preferred format for expressing 12 hour time -#: ../glib/gdatetime.c:209 +#: ../glib/gdatetime.c:211 msgctxt "GDateTime" msgid "%I:%M:%S %p" msgstr "%I:%M:%S %p" -#: ../glib/gdatetime.c:222 +#: ../glib/gdatetime.c:224 msgctxt "full month name" msgid "January" msgstr "Enero" -#: ../glib/gdatetime.c:224 +#: ../glib/gdatetime.c:226 msgctxt "full month name" msgid "February" msgstr "Febrero" -#: ../glib/gdatetime.c:226 +#: ../glib/gdatetime.c:228 msgctxt "full month name" msgid "March" msgstr "Marzo" -#: ../glib/gdatetime.c:228 +#: ../glib/gdatetime.c:230 msgctxt "full month name" msgid "April" msgstr "Abril" -#: ../glib/gdatetime.c:230 +#: ../glib/gdatetime.c:232 msgctxt "full month name" msgid "May" msgstr "Mayo" -#: ../glib/gdatetime.c:232 +#: ../glib/gdatetime.c:234 msgctxt "full month name" msgid "June" msgstr "Junio" -#: ../glib/gdatetime.c:234 +#: ../glib/gdatetime.c:236 msgctxt "full month name" msgid "July" msgstr "Julio" -#: ../glib/gdatetime.c:236 +#: ../glib/gdatetime.c:238 msgctxt "full month name" msgid "August" msgstr "Agosto" -#: ../glib/gdatetime.c:238 +#: ../glib/gdatetime.c:240 msgctxt "full month name" msgid "September" msgstr "Septiembre" -#: ../glib/gdatetime.c:240 +#: ../glib/gdatetime.c:242 msgctxt "full month name" msgid "October" msgstr "Octubre" -#: ../glib/gdatetime.c:242 +#: ../glib/gdatetime.c:244 msgctxt "full month name" msgid "November" msgstr "Noviembre" -#: ../glib/gdatetime.c:244 +#: ../glib/gdatetime.c:246 msgctxt "full month name" msgid "December" msgstr "Diciembre" -#: ../glib/gdatetime.c:259 +#: ../glib/gdatetime.c:261 msgctxt "abbreviated month name" msgid "Jan" msgstr "Ene" -#: ../glib/gdatetime.c:261 +#: ../glib/gdatetime.c:263 msgctxt "abbreviated month name" msgid "Feb" msgstr "Feb" -#: ../glib/gdatetime.c:263 +#: ../glib/gdatetime.c:265 msgctxt "abbreviated month name" msgid "Mar" msgstr "Mar" -#: ../glib/gdatetime.c:265 +#: ../glib/gdatetime.c:267 msgctxt "abbreviated month name" msgid "Apr" msgstr "Abr" -#: ../glib/gdatetime.c:267 +#: ../glib/gdatetime.c:269 msgctxt "abbreviated month name" msgid "May" msgstr "May" -#: ../glib/gdatetime.c:269 +#: ../glib/gdatetime.c:271 msgctxt "abbreviated month name" msgid "Jun" msgstr "Jun" -#: ../glib/gdatetime.c:271 +#: ../glib/gdatetime.c:273 msgctxt "abbreviated month name" msgid "Jul" msgstr "Jul" -#: ../glib/gdatetime.c:273 +#: ../glib/gdatetime.c:275 msgctxt "abbreviated month name" msgid "Aug" msgstr "Ago" -#: ../glib/gdatetime.c:275 +#: ../glib/gdatetime.c:277 msgctxt "abbreviated month name" msgid "Sep" msgstr "Sep" -#: ../glib/gdatetime.c:277 +#: ../glib/gdatetime.c:279 msgctxt "abbreviated month name" msgid "Oct" msgstr "Oct" -#: ../glib/gdatetime.c:279 +#: ../glib/gdatetime.c:281 msgctxt "abbreviated month name" msgid "Nov" msgstr "Nov" -#: ../glib/gdatetime.c:281 +#: ../glib/gdatetime.c:283 msgctxt "abbreviated month name" msgid "Dec" msgstr "Dic" -#: ../glib/gdatetime.c:296 +#: ../glib/gdatetime.c:298 msgctxt "full weekday name" msgid "Monday" msgstr "Lunes" -#: ../glib/gdatetime.c:298 +#: ../glib/gdatetime.c:300 msgctxt "full weekday name" msgid "Tuesday" msgstr "Martes" -#: ../glib/gdatetime.c:300 +#: ../glib/gdatetime.c:302 msgctxt "full weekday name" msgid "Wednesday" msgstr "MieÌrcoles" -#: ../glib/gdatetime.c:302 +#: ../glib/gdatetime.c:304 msgctxt "full weekday name" msgid "Thursday" msgstr "Jueves" -#: ../glib/gdatetime.c:304 +#: ../glib/gdatetime.c:306 msgctxt "full weekday name" msgid "Friday" msgstr "Viernes" -#: ../glib/gdatetime.c:306 +#: ../glib/gdatetime.c:308 msgctxt "full weekday name" msgid "Saturday" msgstr "SaÌbado" -#: ../glib/gdatetime.c:308 +#: ../glib/gdatetime.c:310 msgctxt "full weekday name" msgid "Sunday" msgstr "Domingo" -#: ../glib/gdatetime.c:323 +#: ../glib/gdatetime.c:325 msgctxt "abbreviated weekday name" msgid "Mon" msgstr "Lun" -#: ../glib/gdatetime.c:325 +#: ../glib/gdatetime.c:327 msgctxt "abbreviated weekday name" msgid "Tue" msgstr "Mar" -#: ../glib/gdatetime.c:327 +#: ../glib/gdatetime.c:329 msgctxt "abbreviated weekday name" msgid "Wed" msgstr "Mié" -#: ../glib/gdatetime.c:329 +#: ../glib/gdatetime.c:331 msgctxt "abbreviated weekday name" msgid "Thu" msgstr "Jue" -#: ../glib/gdatetime.c:331 +#: ../glib/gdatetime.c:333 msgctxt "abbreviated weekday name" msgid "Fri" msgstr "Vie" -#: ../glib/gdatetime.c:333 +#: ../glib/gdatetime.c:335 msgctxt "abbreviated weekday name" msgid "Sat" msgstr "Sáb" -#: ../glib/gdatetime.c:335 +#: ../glib/gdatetime.c:337 msgctxt "abbreviated weekday name" msgid "Sun" msgstr "Dom" #. Translators: 'before midday' indicator -#: ../glib/gdatetime.c:352 +#: ../glib/gdatetime.c:354 msgctxt "GDateTime" msgid "AM" msgstr "AM" #. Translators: 'after midday' indicator -#: ../glib/gdatetime.c:355 +#: ../glib/gdatetime.c:357 msgctxt "GDateTime" msgid "PM" msgstr "PM" @@ -5274,77 +5259,77 @@ msgstr "" msgid "Text was empty (or contained only whitespace)" msgstr "El texto está vacÃo (o sólo contiene espacios en blanco)" -#: ../glib/gspawn.c:207 +#: ../glib/gspawn.c:250 #, c-format msgid "Failed to read data from child process (%s)" msgstr "Falló en la lectura de datos desde el proceso hijo (%s)" -#: ../glib/gspawn.c:351 +#: ../glib/gspawn.c:394 #, c-format msgid "Unexpected error in select() reading data from a child process (%s)" msgstr "Falló inesperado en select() leyendo datos desde el proceso hijo (%s)" -#: ../glib/gspawn.c:436 +#: ../glib/gspawn.c:479 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "Falló inesperado en waitpid() (%s)" -#: ../glib/gspawn.c:842 ../glib/gspawn-win32.c:1231 +#: ../glib/gspawn.c:886 ../glib/gspawn-win32.c:1231 #, c-format msgid "Child process exited with code %ld" msgstr "El proceso hijo terminó con el código %ld" -#: ../glib/gspawn.c:850 +#: ../glib/gspawn.c:894 #, c-format msgid "Child process killed by signal %ld" msgstr "El proceso hijo terminado por la señal %ld" -#: ../glib/gspawn.c:857 +#: ../glib/gspawn.c:901 #, c-format msgid "Child process stopped by signal %ld" msgstr "El proceso hijo se detuvo por la señal %ld" -#: ../glib/gspawn.c:864 +#: ../glib/gspawn.c:908 #, c-format msgid "Child process exited abnormally" msgstr "El proceso hijo terminó de forma anormal" -#: ../glib/gspawn.c:1269 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345 +#: ../glib/gspawn.c:1313 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "Falló al leer desde el conducto hijo (%s)" -#: ../glib/gspawn.c:1339 +#: ../glib/gspawn.c:1383 #, c-format msgid "Failed to fork (%s)" msgstr "Falló al bifurcar (fork) (%s)" -#: ../glib/gspawn.c:1488 ../glib/gspawn-win32.c:368 +#: ../glib/gspawn.c:1532 ../glib/gspawn-win32.c:368 #, c-format msgid "Failed to change to directory “%s†(%s)" msgstr "Falló al cambiar a la carpeta «%s» (%s)" -#: ../glib/gspawn.c:1498 +#: ../glib/gspawn.c:1542 #, c-format msgid "Failed to execute child process “%s†(%s)" msgstr "Falló al ejecutar el proceso hijo «%s» (%s)" -#: ../glib/gspawn.c:1508 +#: ../glib/gspawn.c:1552 #, c-format msgid "Failed to redirect output or input of child process (%s)" msgstr "Falló al redirigir la salida o la entrada del proceso hijo (%s)" -#: ../glib/gspawn.c:1517 +#: ../glib/gspawn.c:1561 #, c-format msgid "Failed to fork child process (%s)" msgstr "Falló al bifurcar el proceso hijo (%s)" -#: ../glib/gspawn.c:1525 +#: ../glib/gspawn.c:1569 #, c-format msgid "Unknown error executing child process “%sâ€" msgstr "Error desconocido al ejecutar el proceso hijo «%s»" -#: ../glib/gspawn.c:1549 +#: ../glib/gspawn.c:1593 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "Falló al leer suficientes datos desde el conducto del pid hijo (%s)" @@ -5398,6 +5383,27 @@ msgstr "" "Falló inesperado en g_io_channel_win32_poll() al leer datos desde un proceso " "hijo" +#: ../glib/gstrfuncs.c:3237 ../glib/gstrfuncs.c:3338 +msgid "Empty string is not a number" +msgstr "Una cadena vacÃa no es un número" + +#: ../glib/gstrfuncs.c:3261 +#, c-format +#| msgid "'%s' is not a valid name" +msgid "“%s†is not a signed number" +msgstr "«%s» no es un número con signo" + +#: ../glib/gstrfuncs.c:3271 ../glib/gstrfuncs.c:3374 +#, c-format +msgid "Number “%s†is out of bounds [%s, %s]" +msgstr "El número «%s» está fuera de los lÃmites [%s, %s]" + +#: ../glib/gstrfuncs.c:3364 +#, c-format +#| msgid "'%s' is not a valid name" +msgid "“%s†is not an unsigned number" +msgstr "«%s» no es un número sin signo" + #: ../glib/gutf8.c:798 msgid "Failed to allocate memory" msgstr "Falló al obtener memoria" diff --git a/po/glib20.pot b/po/glib20.pot index b1fae7418..1447c89b3 100644 --- a/po/glib20.pot +++ b/po/glib20.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-05-22 14:29-0400\n" +"POT-Creation-Date: 2017-06-19 22:04-0400\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" @@ -19,19 +19,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "GApplication options" msgstr "" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "Show GApplication options" msgstr "" -#: ../gio/gapplication.c:538 +#: ../gio/gapplication.c:535 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" -#: ../gio/gapplication.c:550 +#: ../gio/gapplication.c:547 msgid "Override the application’s ID" msgstr "" @@ -268,7 +268,7 @@ msgid "Truncate not supported on base stream" msgstr "" #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 -#: ../gio/gdbusprivate.c:1399 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 #: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" @@ -299,7 +299,7 @@ msgstr "" msgid "Error during conversion: %s" msgstr "" -#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1095 msgid "Cancellable initialization not supported" msgstr "" @@ -853,12 +853,12 @@ msgstr "" msgid "Error return with empty body" msgstr "" -#: ../gio/gdbusprivate.c:2063 +#: ../gio/gdbusprivate.c:2066 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "" -#: ../gio/gdbusprivate.c:2108 +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "" @@ -1168,38 +1168,38 @@ msgstr "" msgid "Error: %s is not a valid well-known bus name.\n" msgstr "" -#: ../gio/gdesktopappinfo.c:1997 ../gio/gdesktopappinfo.c:4504 +#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533 msgid "Unnamed" msgstr "" -#: ../gio/gdesktopappinfo.c:2407 +#: ../gio/gdesktopappinfo.c:2411 msgid "Desktop file didn’t specify Exec field" msgstr "" -#: ../gio/gdesktopappinfo.c:2692 +#: ../gio/gdesktopappinfo.c:2696 msgid "Unable to find terminal required for application" msgstr "" -#: ../gio/gdesktopappinfo.c:3100 +#: ../gio/gdesktopappinfo.c:3129 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" -#: ../gio/gdesktopappinfo.c:3104 +#: ../gio/gdesktopappinfo.c:3133 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" -#: ../gio/gdesktopappinfo.c:3344 ../gio/gdesktopappinfo.c:3368 +#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397 msgid "Application information lacks an identifier" msgstr "" -#: ../gio/gdesktopappinfo.c:3602 +#: ../gio/gdesktopappinfo.c:3631 #, c-format msgid "Can’t create user desktop file %s" msgstr "" -#: ../gio/gdesktopappinfo.c:3736 +#: ../gio/gdesktopappinfo.c:3765 #, c-format msgid "Custom definition for %s" msgstr "" @@ -2601,9 +2601,9 @@ msgstr "" msgid "Can’t move directory over directory" msgstr "" -#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 -#: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 -#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:931 +#: ../gio/glocalfileoutputstream.c:945 ../gio/glocalfileoutputstream.c:960 +#: ../gio/glocalfileoutputstream.c:977 ../gio/glocalfileoutputstream.c:991 msgid "Backup file creation failed" msgstr "" @@ -2642,7 +2642,7 @@ msgstr "" msgid " (invalid encoding)" msgstr "" -#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 +#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:809 #, c-format msgid "Error when getting information for file “%sâ€: %s" msgstr "" @@ -2722,7 +2722,7 @@ msgstr "" #: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211 #: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333 -#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003 +#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1009 #, c-format msgid "Error seeking in file: %s" msgstr "" @@ -2758,30 +2758,30 @@ msgstr "" msgid "Error renaming temporary file: %s" msgstr "" -#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054 +#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1060 #, c-format msgid "Error truncating file: %s" msgstr "" -#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 -#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 +#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:791 +#: ../gio/glocalfileoutputstream.c:1041 ../gio/gsubprocess.c:360 #, c-format msgid "Error opening file “%sâ€: %s" msgstr "" -#: ../gio/glocalfileoutputstream.c:816 +#: ../gio/glocalfileoutputstream.c:822 msgid "Target file is a directory" msgstr "" -#: ../gio/glocalfileoutputstream.c:821 +#: ../gio/glocalfileoutputstream.c:827 msgid "Target file is not a regular file" msgstr "" -#: ../gio/glocalfileoutputstream.c:833 +#: ../gio/glocalfileoutputstream.c:839 msgid "The file was externally modified" msgstr "" -#: ../gio/glocalfileoutputstream.c:1019 +#: ../gio/glocalfileoutputstream.c:1025 #, c-format msgid "Error removing old file: %s" msgstr "" @@ -2915,15 +2915,15 @@ msgstr "" msgid "Error resolving “%sâ€: %s" msgstr "" -#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 -#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 -#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 +#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874 +#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143 +#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format msgid "The resource at “%s†does not exist" msgstr "" -#: ../gio/gresource.c:760 +#: ../gio/gresource.c:771 #, c-format msgid "The resource at “%s†failed to decompress" msgstr "" @@ -3237,144 +3237,144 @@ msgstr "" msgid "No such key “%sâ€\n" msgstr "" -#: ../gio/gsocket.c:369 +#: ../gio/gsocket.c:379 msgid "Invalid socket, not initialized" msgstr "" -#: ../gio/gsocket.c:376 +#: ../gio/gsocket.c:386 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "" -#: ../gio/gsocket.c:384 +#: ../gio/gsocket.c:394 msgid "Socket is already closed" msgstr "" -#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 -#: ../gio/gsocket.c:3995 +#: ../gio/gsocket.c:409 ../gio/gsocket.c:2764 ../gio/gsocket.c:3949 +#: ../gio/gsocket.c:4005 msgid "Socket I/O timed out" msgstr "" -#: ../gio/gsocket.c:531 +#: ../gio/gsocket.c:541 #, c-format msgid "creating GSocket from fd: %s" msgstr "" -#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 +#: ../gio/gsocket.c:569 ../gio/gsocket.c:623 ../gio/gsocket.c:630 #, c-format msgid "Unable to create socket: %s" msgstr "" -#: ../gio/gsocket.c:613 +#: ../gio/gsocket.c:623 msgid "Unknown family was specified" msgstr "" -#: ../gio/gsocket.c:620 +#: ../gio/gsocket.c:630 msgid "Unknown protocol was specified" msgstr "" -#: ../gio/gsocket.c:1111 +#: ../gio/gsocket.c:1121 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" -#: ../gio/gsocket.c:1128 +#: ../gio/gsocket.c:1138 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" -#: ../gio/gsocket.c:1932 +#: ../gio/gsocket.c:1942 #, c-format msgid "could not get local address: %s" msgstr "" -#: ../gio/gsocket.c:1975 +#: ../gio/gsocket.c:1985 #, c-format msgid "could not get remote address: %s" msgstr "" -#: ../gio/gsocket.c:2041 +#: ../gio/gsocket.c:2051 #, c-format msgid "could not listen: %s" msgstr "" -#: ../gio/gsocket.c:2140 +#: ../gio/gsocket.c:2150 #, c-format msgid "Error binding to address: %s" msgstr "" -#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 +#: ../gio/gsocket.c:2265 ../gio/gsocket.c:2302 #, c-format msgid "Error joining multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 +#: ../gio/gsocket.c:2266 ../gio/gsocket.c:2303 #, c-format msgid "Error leaving multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2257 +#: ../gio/gsocket.c:2267 msgid "No support for source-specific multicast" msgstr "" -#: ../gio/gsocket.c:2477 +#: ../gio/gsocket.c:2487 #, c-format msgid "Error accepting connection: %s" msgstr "" -#: ../gio/gsocket.c:2598 +#: ../gio/gsocket.c:2608 msgid "Connection in progress" msgstr "" -#: ../gio/gsocket.c:2647 +#: ../gio/gsocket.c:2657 msgid "Unable to get pending error: " msgstr "" -#: ../gio/gsocket.c:2817 +#: ../gio/gsocket.c:2827 #, c-format msgid "Error receiving data: %s" msgstr "" -#: ../gio/gsocket.c:3012 +#: ../gio/gsocket.c:3022 #, c-format msgid "Error sending data: %s" msgstr "" -#: ../gio/gsocket.c:3199 +#: ../gio/gsocket.c:3209 #, c-format msgid "Unable to shutdown socket: %s" msgstr "" -#: ../gio/gsocket.c:3280 +#: ../gio/gsocket.c:3290 #, c-format msgid "Error closing socket: %s" msgstr "" -#: ../gio/gsocket.c:3932 +#: ../gio/gsocket.c:3942 #, c-format msgid "Waiting for socket condition: %s" msgstr "" -#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 +#: ../gio/gsocket.c:4414 ../gio/gsocket.c:4494 ../gio/gsocket.c:4672 #, c-format msgid "Error sending message: %s" msgstr "" -#: ../gio/gsocket.c:4428 +#: ../gio/gsocket.c:4438 msgid "GSocketControlMessage not supported on Windows" msgstr "" -#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 +#: ../gio/gsocket.c:4891 ../gio/gsocket.c:4964 ../gio/gsocket.c:5190 #, c-format msgid "Error receiving message: %s" msgstr "" -#: ../gio/gsocket.c:5452 +#: ../gio/gsocket.c:5462 #, c-format msgid "Unable to read socket credentials: %s" msgstr "" -#: ../gio/gsocket.c:5461 +#: ../gio/gsocket.c:5471 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" @@ -3555,13 +3555,15 @@ msgid "" "is locked out." msgstr "" -#: ../gio/gtlspassword.c:113 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" -#: ../gio/gtlspassword.c:115 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "" @@ -5038,75 +5040,75 @@ msgstr "" msgid "Character out of range for UTF-16" msgstr "" -#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272 +#: ../glib/gutils.c:2147 ../glib/gutils.c:2174 ../glib/gutils.c:2280 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "" msgstr[1] "" -#: ../glib/gutils.c:2145 +#: ../glib/gutils.c:2153 #, c-format msgid "%.1f KiB" msgstr "" -#: ../glib/gutils.c:2147 +#: ../glib/gutils.c:2155 #, c-format msgid "%.1f MiB" msgstr "" -#: ../glib/gutils.c:2150 +#: ../glib/gutils.c:2158 #, c-format msgid "%.1f GiB" msgstr "" -#: ../glib/gutils.c:2153 +#: ../glib/gutils.c:2161 #, c-format msgid "%.1f TiB" msgstr "" -#: ../glib/gutils.c:2156 +#: ../glib/gutils.c:2164 #, c-format msgid "%.1f PiB" msgstr "" -#: ../glib/gutils.c:2159 +#: ../glib/gutils.c:2167 #, c-format msgid "%.1f EiB" msgstr "" -#: ../glib/gutils.c:2172 +#: ../glib/gutils.c:2180 #, c-format msgid "%.1f kB" msgstr "" -#: ../glib/gutils.c:2175 ../glib/gutils.c:2290 +#: ../glib/gutils.c:2183 ../glib/gutils.c:2298 #, c-format msgid "%.1f MB" msgstr "" -#: ../glib/gutils.c:2178 ../glib/gutils.c:2295 +#: ../glib/gutils.c:2186 ../glib/gutils.c:2303 #, c-format msgid "%.1f GB" msgstr "" -#: ../glib/gutils.c:2180 ../glib/gutils.c:2300 +#: ../glib/gutils.c:2188 ../glib/gutils.c:2308 #, c-format msgid "%.1f TB" msgstr "" -#: ../glib/gutils.c:2183 ../glib/gutils.c:2305 +#: ../glib/gutils.c:2191 ../glib/gutils.c:2313 #, c-format msgid "%.1f PB" msgstr "" -#: ../glib/gutils.c:2186 ../glib/gutils.c:2310 +#: ../glib/gutils.c:2194 ../glib/gutils.c:2318 #, c-format msgid "%.1f EB" msgstr "" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: ../glib/gutils.c:2223 +#: ../glib/gutils.c:2231 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -5118,7 +5120,7 @@ msgstr[1] "" #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: ../glib/gutils.c:2285 +#: ../glib/gutils.c:2293 #, c-format msgid "%.1f KB" msgstr "" Binary files differ@@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: glib master\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-05-12 09:06+0000\n" -"PO-Revision-Date: 2017-05-15 12:13+0700\n" +"POT-Creation-Date: 2017-05-29 10:24+0000\n" +"PO-Revision-Date: 2017-05-29 20:44+0700\n" "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n" "Language-Team: Indonesian <gnome@i15n.org>\n" "Language: id\n" @@ -21,19 +21,19 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.11\n" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "GApplication options" msgstr "Opsi GApplication" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "Show GApplication options" msgstr "Tunjukkan opsi GApplication" -#: ../gio/gapplication.c:538 +#: ../gio/gapplication.c:535 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "Masuk mode layanan GApplication (pakai dari berkas layanan D-Bus)" -#: ../gio/gapplication.c:550 +#: ../gio/gapplication.c:547 msgid "Override the application’s ID" msgstr "Timpa ID aplikasi" @@ -284,7 +284,7 @@ msgid "Truncate not supported on base stream" msgstr "Pemenggalan tak didukung pada stream basis" #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 -#: ../gio/gdbusprivate.c:1379 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 #: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" @@ -517,7 +517,7 @@ msgstr "" "Tak bisa menentukan alamat bus dari variabel lingkungan " "DBUS_STARTER_BUS_TYPE — nilai tak dikenal \"%s\"" -#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7157 +#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7155 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" @@ -672,12 +672,12 @@ msgstr "" "Galat menata properti '%s': Tipe yang diharapkan '%s' tapi diperoleh '%s'" #: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 -#: ../gio/gdbusconnection.c:6588 +#: ../gio/gdbusconnection.c:6586 #, c-format msgid "No such interface '%s'" msgstr "Tak ada antar muka '%s'" -#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7097 +#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" msgstr "Tak ada antar muka '%s' pada objek di lokasi %s" @@ -712,17 +712,17 @@ msgstr "Tak bisa menata properti %s.%s" msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "Metoda '%s' mengembalikan tipe '%s', tapi yang diharapkan '%s'" -#: ../gio/gdbusconnection.c:6699 +#: ../gio/gdbusconnection.c:6697 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "Metoda '%s' pada antar muka '%s' dengan tanda tangan '%s' tak ada" -#: ../gio/gdbusconnection.c:6820 +#: ../gio/gdbusconnection.c:6818 #, c-format msgid "A subtree is already exported for %s" msgstr "Subtree telah diekspor bagi %s" -#: ../gio/gdbusconnection.c:7148 +#: ../gio/gdbusconnection.c:7146 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " @@ -917,12 +917,12 @@ msgstr "Galat balikan dengan tubuh bertipe \"%s\"" msgid "Error return with empty body" msgstr "Galat balikan dengan body kosong" -#: ../gio/gdbusprivate.c:2043 +#: ../gio/gdbusprivate.c:2066 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "Tak bisa mendapat profil perangkat keras: %s" -#: ../gio/gdbusprivate.c:2088 +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "Tak bisa memuat /var/lib/dbus/machine-id ata /etc/machine-id: " @@ -3766,15 +3766,17 @@ msgstr "" "Ini adalah kesempatan terakhir untuk memasukkan sandi secara benar sebelum " "akses Anda diblokir." -#: ../gio/gtlspassword.c:113 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" -"Beberapa sandi yang dimasukkan salah, dan akses Anda akan diblokir setelah " -"gagal lagi." +"Beberapa kata sandi yang dimasukkan salah, dan akses Anda akan terkunci " +"setelah gagal lagi." -#: ../gio/gtlspassword.c:115 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "Sandi yang dimasukkan salah." @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-11-20 18:36+0000\n" -"PO-Revision-Date: 2016-12-08 15:03+0500\n" +"POT-Creation-Date: 2017-06-14 08:57+0000\n" +"PO-Revision-Date: 2017-06-17 16:00+0500\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n" "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n" "Language: kk\n" @@ -17,27 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.2\n" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "GApplication options" msgstr "GApplication опциÑлары" -#: ../gio/gapplication.c:493 +#: ../gio/gapplication.c:490 msgid "Show GApplication options" msgstr "GApplication опциÑларын көрÑету" -#: ../gio/gapplication.c:538 +#: ../gio/gapplication.c:535 msgid "Enter GApplication service mode (use from D-Bus service files)" msgstr "" -#: ../gio/gapplication.c:550 -#| msgid "List applications" +#: ../gio/gapplication.c:547 msgid "Override the application’s ID" msgstr "" #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46 -#: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488 +#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488 #: ../gio/gsettings-tool.c:520 msgid "Print help" msgstr "Көмекті шығару" @@ -47,7 +46,7 @@ msgstr "Көмекті шығару" msgid "[COMMAND]" msgstr "[КОМÐÐДÐ]" -#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:210 +#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228 msgid "Print version" msgstr "ÐÒ±Ñқа ақпаратын шығару" @@ -100,7 +99,7 @@ msgid "APPID" msgstr "APPID" #: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133 -#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:206 +#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224 msgid "COMMAND" msgstr "КОМÐÐДÐ" @@ -157,7 +156,7 @@ msgstr "Ðргументтер:\n" #: ../gio/gapplication-tool.c:133 msgid "[ARGS…]" -msgstr "" +msgstr "[ÐРГУМЕÐТТЕР…]" #: ../gio/gapplication-tool.c:134 #, c-format @@ -273,7 +272,7 @@ msgid "Truncate not supported on base stream" msgstr "" #: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849 -#: ../gio/gdbusprivate.c:1377 ../gio/gsimpleasyncresult.c:870 +#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:870 #: ../gio/gsimpleasyncresult.c:896 #, c-format msgid "Operation was cancelled" @@ -294,7 +293,7 @@ msgstr "" #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848 #: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845 #: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598 -#: ../glib/giochannel.c:2442 ../glib/gutf8.c:855 ../glib/gutf8.c:1308 +#: ../glib/giochannel.c:2442 ../glib/gutf8.c:856 ../glib/gutf8.c:1309 msgid "Invalid byte sequence in conversion input" msgstr "" @@ -304,9 +303,9 @@ msgstr "" msgid "Error during conversion: %s" msgstr "" -#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078 +#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1085 msgid "Cancellable initialization not supported" -msgstr "" +msgstr "Ð‘Ð°Ñ Ñ‚Ð°Ñ€Ñ‚ÑƒÒ“Ð° болатын инициализациÑға қолдау жоқ" #: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321 #: ../glib/giochannel.c:1384 @@ -319,16 +318,16 @@ msgstr "" msgid "Could not open converter from “%s†to “%sâ€" msgstr "" -#: ../gio/gcontenttype.c:335 +#: ../gio/gcontenttype.c:358 #, c-format msgid "%s type" msgstr "%s түрі" -#: ../gio/gcontenttype-win32.c:160 +#: ../gio/gcontenttype-win32.c:177 msgid "Unknown type" msgstr "БелгіÑіз түрі" -#: ../gio/gcontenttype-win32.c:162 +#: ../gio/gcontenttype-win32.c:179 #, c-format msgid "%s filetype" msgstr "%s файл түрі" @@ -353,156 +352,155 @@ msgstr "" msgid "Unexpected early end-of-stream" msgstr "" -#: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241 -#: ../gio/gdbusaddress.c:322 +#: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243 +#: ../gio/gdbusaddress.c:324 #, c-format msgid "Unsupported key “%s†in address entry “%sâ€" msgstr "" -#: ../gio/gdbusaddress.c:180 +#: ../gio/gdbusaddress.c:182 #, c-format msgid "" "Address “%s†is invalid (need exactly one of path, tmpdir or abstract keys)" msgstr "" -#: ../gio/gdbusaddress.c:193 +#: ../gio/gdbusaddress.c:195 #, c-format msgid "Meaningless key/value pair combination in address entry “%sâ€" msgstr "" -#: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337 +#: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339 #, c-format msgid "Error in address “%s†— the port attribute is malformed" msgstr "" -#: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348 +#: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350 #, c-format msgid "Error in address “%s†— the family attribute is malformed" msgstr "" -#: ../gio/gdbusaddress.c:457 +#: ../gio/gdbusaddress.c:460 #, c-format msgid "Address element “%s†does not contain a colon (:)" msgstr "" -#: ../gio/gdbusaddress.c:478 +#: ../gio/gdbusaddress.c:481 #, c-format msgid "" "Key/Value pair %d, “%sâ€, in address element “%s†does not contain an equal " "sign" msgstr "" -#: ../gio/gdbusaddress.c:492 +#: ../gio/gdbusaddress.c:495 #, c-format msgid "" "Error unescaping key or value in Key/Value pair %d, “%sâ€, in address element " "“%sâ€" msgstr "" -#: ../gio/gdbusaddress.c:570 +#: ../gio/gdbusaddress.c:573 #, c-format msgid "" "Error in address “%s†— the unix transport requires exactly one of the keys " "“path†or “abstract†to be set" msgstr "" -#: ../gio/gdbusaddress.c:606 +#: ../gio/gdbusaddress.c:609 #, c-format msgid "Error in address “%s†— the host attribute is missing or malformed" msgstr "" -#: ../gio/gdbusaddress.c:620 +#: ../gio/gdbusaddress.c:623 #, c-format msgid "Error in address “%s†— the port attribute is missing or malformed" msgstr "" -#: ../gio/gdbusaddress.c:634 +#: ../gio/gdbusaddress.c:637 #, c-format msgid "Error in address “%s†— the noncefile attribute is missing or malformed" msgstr "" -#: ../gio/gdbusaddress.c:655 +#: ../gio/gdbusaddress.c:658 msgid "Error auto-launching: " msgstr "" -#: ../gio/gdbusaddress.c:663 +#: ../gio/gdbusaddress.c:666 #, c-format msgid "Unknown or unsupported transport “%s†for address “%sâ€" msgstr "" -#: ../gio/gdbusaddress.c:699 +#: ../gio/gdbusaddress.c:702 #, c-format msgid "Error opening nonce file “%sâ€: %s" msgstr "\"%s\" файлын ашу қатеÑÑ–: %s" -#: ../gio/gdbusaddress.c:717 +#: ../gio/gdbusaddress.c:720 #, c-format msgid "Error reading from nonce file “%sâ€: %s" msgstr "\"%s\" nonce файлынан оқу қатеÑÑ–: %s" -#: ../gio/gdbusaddress.c:726 +#: ../gio/gdbusaddress.c:729 #, c-format msgid "Error reading from nonce file “%sâ€, expected 16 bytes, got %d" msgstr "" -#: ../gio/gdbusaddress.c:744 +#: ../gio/gdbusaddress.c:747 #, c-format msgid "Error writing contents of nonce file “%s†to stream:" msgstr "" -#: ../gio/gdbusaddress.c:951 +#: ../gio/gdbusaddress.c:956 msgid "The given address is empty" msgstr "" -#: ../gio/gdbusaddress.c:1064 +#: ../gio/gdbusaddress.c:1069 #, c-format msgid "Cannot spawn a message bus when setuid" msgstr "" -#: ../gio/gdbusaddress.c:1071 +#: ../gio/gdbusaddress.c:1076 msgid "Cannot spawn a message bus without a machine-id: " msgstr "" -#: ../gio/gdbusaddress.c:1078 +#: ../gio/gdbusaddress.c:1083 #, c-format msgid "Cannot autolaunch D-Bus without X11 $DISPLAY" msgstr "" -#: ../gio/gdbusaddress.c:1120 +#: ../gio/gdbusaddress.c:1125 #, c-format -#| msgid "Error opening file %s: %s" msgid "Error spawning command line “%sâ€: " msgstr "" -#: ../gio/gdbusaddress.c:1337 +#: ../gio/gdbusaddress.c:1342 #, c-format msgid "(Type any character to close this window)\n" msgstr "" -#: ../gio/gdbusaddress.c:1489 +#: ../gio/gdbusaddress.c:1496 #, c-format msgid "Session dbus not running, and autolaunch failed" msgstr "" -#: ../gio/gdbusaddress.c:1500 +#: ../gio/gdbusaddress.c:1507 #, c-format msgid "Cannot determine session bus address (not implemented for this OS)" msgstr "" -#: ../gio/gdbusaddress.c:1635 +#: ../gio/gdbusaddress.c:1645 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "— unknown value “%sâ€" msgstr "" -#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142 +#: ../gio/gdbusaddress.c:1654 ../gio/gdbusconnection.c:7155 msgid "" "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment " "variable is not set" msgstr "" -#: ../gio/gdbusaddress.c:1654 +#: ../gio/gdbusaddress.c:1664 #, c-format msgid "Unknown bus type %d" msgstr "" @@ -521,13 +519,12 @@ msgid "" "Exhausted all available authentication mechanisms (tried: %s) (available: %s)" msgstr "" -#: ../gio/gdbusauth.c:1173 +#: ../gio/gdbusauth.c:1174 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:261 #, c-format -#| msgid "Error creating directory %s: %s" msgid "Error when getting information for directory “%sâ€: %s" msgstr "\"%s\" бума ақпаратын алу қатеÑÑ–: %s" @@ -571,25 +568,21 @@ msgstr "" #: ../gio/gdbusauthmechanismsha1.c:532 #, c-format -#| msgid "Error opening file %s: %s" msgid "Error deleting stale lock file “%sâ€: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:564 #, c-format -#| msgid "Error renaming file %s: %s" msgid "Error creating lock file “%sâ€: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:594 #, c-format -#| msgid "Error closing file: %s" msgid "Error closing (unlinked) lock file “%sâ€: %s" msgstr "" #: ../gio/gdbusauthmechanismsha1.c:604 #, c-format -#| msgid "Error opening file %s: %s" msgid "Error unlinking lock file “%sâ€: %s" msgstr "" @@ -603,167 +596,164 @@ msgstr "" msgid "(Additionally, releasing the lock for “%s†also failed: %s) " msgstr "" -#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377 +#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378 msgid "The connection is closed" -msgstr "" +msgstr "Ð‘Ð°Ð¹Ð»Ð°Ð½Ñ‹Ñ Ð¶Ð°Ð±Ñ‹Ð»Ò“Ð°Ð½" #: ../gio/gdbusconnection.c:1879 msgid "Timeout was reached" msgstr "" -#: ../gio/gdbusconnection.c:2499 +#: ../gio/gdbusconnection.c:2500 msgid "" "Unsupported flags encountered when constructing a client-side connection" msgstr "" -#: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456 +#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471 #, c-format msgid "" "No such interface 'org.freedesktop.DBus.Properties' on object at path %s" msgstr "" -#: ../gio/gdbusconnection.c:4251 +#: ../gio/gdbusconnection.c:4266 #, c-format msgid "No such property '%s'" msgstr "" -#: ../gio/gdbusconnection.c:4263 +#: ../gio/gdbusconnection.c:4278 #, c-format msgid "Property '%s' is not readable" msgstr "" -#: ../gio/gdbusconnection.c:4274 +#: ../gio/gdbusconnection.c:4289 #, c-format msgid "Property '%s' is not writable" msgstr "" -#: ../gio/gdbusconnection.c:4294 +#: ../gio/gdbusconnection.c:4309 #, c-format msgid "Error setting property '%s': Expected type '%s' but got '%s'" msgstr "" -#: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573 +#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622 +#: ../gio/gdbusconnection.c:6586 #, c-format msgid "No such interface '%s'" msgstr "" -#: ../gio/gdbusconnection.c:4607 -msgid "No such interface" -msgstr "" - -#: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082 +#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095 #, c-format msgid "No such interface '%s' on object at path %s" msgstr "" -#: ../gio/gdbusconnection.c:4923 +#: ../gio/gdbusconnection.c:4938 #, c-format msgid "No such method '%s'" msgstr "" -#: ../gio/gdbusconnection.c:4954 +#: ../gio/gdbusconnection.c:4969 #, c-format msgid "Type of message, '%s', does not match expected type '%s'" msgstr "" -#: ../gio/gdbusconnection.c:5152 +#: ../gio/gdbusconnection.c:5167 #, c-format msgid "An object is already exported for the interface %s at %s" msgstr "" -#: ../gio/gdbusconnection.c:5378 +#: ../gio/gdbusconnection.c:5393 #, c-format msgid "Unable to retrieve property %s.%s" msgstr "" -#: ../gio/gdbusconnection.c:5434 +#: ../gio/gdbusconnection.c:5449 #, c-format msgid "Unable to set property %s.%s" msgstr "%s қаÑиетін орнату мүмкін емеÑ.%s" -#: ../gio/gdbusconnection.c:5610 +#: ../gio/gdbusconnection.c:5625 #, c-format msgid "Method '%s' returned type '%s', but expected '%s'" msgstr "" -#: ../gio/gdbusconnection.c:6684 +#: ../gio/gdbusconnection.c:6697 #, c-format msgid "Method '%s' on interface '%s' with signature '%s' does not exist" msgstr "" -#: ../gio/gdbusconnection.c:6805 +#: ../gio/gdbusconnection.c:6818 #, c-format msgid "A subtree is already exported for %s" msgstr "" -#: ../gio/gdbusconnection.c:7133 +#: ../gio/gdbusconnection.c:7146 #, c-format msgid "" "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable " "- unknown value '%s'" msgstr "" -#: ../gio/gdbusmessage.c:1244 +#: ../gio/gdbusmessage.c:1246 msgid "type is INVALID" msgstr "" -#: ../gio/gdbusmessage.c:1255 +#: ../gio/gdbusmessage.c:1257 msgid "METHOD_CALL message: PATH or MEMBER header field is missing" msgstr "" -#: ../gio/gdbusmessage.c:1266 +#: ../gio/gdbusmessage.c:1268 msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing" msgstr "" -#: ../gio/gdbusmessage.c:1278 +#: ../gio/gdbusmessage.c:1280 msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing" msgstr "" -#: ../gio/gdbusmessage.c:1291 +#: ../gio/gdbusmessage.c:1293 msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing" msgstr "" -#: ../gio/gdbusmessage.c:1299 +#: ../gio/gdbusmessage.c:1301 msgid "" "SIGNAL message: The PATH header field is using the reserved value /org/" "freedesktop/DBus/Local" msgstr "" -#: ../gio/gdbusmessage.c:1307 +#: ../gio/gdbusmessage.c:1309 msgid "" "SIGNAL message: The INTERFACE header field is using the reserved value org." "freedesktop.DBus.Local" msgstr "" -#: ../gio/gdbusmessage.c:1355 ../gio/gdbusmessage.c:1415 +#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417 #, c-format msgid "Wanted to read %lu byte but only got %lu" msgid_plural "Wanted to read %lu bytes but only got %lu" msgstr[0] "" -#: ../gio/gdbusmessage.c:1369 +#: ../gio/gdbusmessage.c:1371 #, c-format msgid "Expected NUL byte after the string “%s†but found byte %d" msgstr "" -#: ../gio/gdbusmessage.c:1388 +#: ../gio/gdbusmessage.c:1390 #, c-format msgid "" "Expected valid UTF-8 string but found invalid bytes at byte offset %d " "(length of string is %d). The valid UTF-8 string up until that point was “%sâ€" msgstr "" -#: ../gio/gdbusmessage.c:1587 +#: ../gio/gdbusmessage.c:1589 #, c-format msgid "Parsed value “%s†is not a valid D-Bus object path" msgstr "" -#: ../gio/gdbusmessage.c:1609 +#: ../gio/gdbusmessage.c:1611 #, c-format msgid "Parsed value “%s†is not a valid D-Bus signature" msgstr "" -#: ../gio/gdbusmessage.c:1656 +#: ../gio/gdbusmessage.c:1658 #, c-format msgid "" "Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)." @@ -771,105 +761,105 @@ msgid_plural "" "Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)." msgstr[0] "" -#: ../gio/gdbusmessage.c:1676 +#: ../gio/gdbusmessage.c:1678 #, c-format msgid "" "Encountered array of type “a%câ€, expected to have a length a multiple of %u " "bytes, but found to be %u bytes in length" msgstr "" -#: ../gio/gdbusmessage.c:1843 +#: ../gio/gdbusmessage.c:1845 #, c-format msgid "Parsed value “%s†for variant is not a valid D-Bus signature" msgstr "" -#: ../gio/gdbusmessage.c:1867 +#: ../gio/gdbusmessage.c:1869 #, c-format msgid "" "Error deserializing GVariant with type string “%s†from the D-Bus wire format" msgstr "" -#: ../gio/gdbusmessage.c:2051 +#: ../gio/gdbusmessage.c:2053 #, c-format msgid "" "Invalid endianness value. Expected 0x6c (“lâ€) or 0x42 (“Bâ€) but found value " "0x%02x" msgstr "" -#: ../gio/gdbusmessage.c:2064 +#: ../gio/gdbusmessage.c:2066 #, c-format msgid "Invalid major protocol version. Expected 1 but found %d" msgstr "" -#: ../gio/gdbusmessage.c:2120 +#: ../gio/gdbusmessage.c:2122 #, c-format msgid "Signature header with signature “%s†found but message body is empty" msgstr "" -#: ../gio/gdbusmessage.c:2134 +#: ../gio/gdbusmessage.c:2136 #, c-format msgid "Parsed value “%s†is not a valid D-Bus signature (for body)" msgstr "" -#: ../gio/gdbusmessage.c:2164 +#: ../gio/gdbusmessage.c:2166 #, c-format msgid "No signature header in message but the message body is %u byte" msgid_plural "No signature header in message but the message body is %u bytes" msgstr[0] "" -#: ../gio/gdbusmessage.c:2174 +#: ../gio/gdbusmessage.c:2176 msgid "Cannot deserialize message: " msgstr "" -#: ../gio/gdbusmessage.c:2515 +#: ../gio/gdbusmessage.c:2517 #, c-format msgid "" "Error serializing GVariant with type string “%s†to the D-Bus wire format" msgstr "" -#: ../gio/gdbusmessage.c:2652 +#: ../gio/gdbusmessage.c:2654 #, c-format msgid "" "Message has %d file descriptors but the header field indicates %d file " "descriptors" msgstr "" -#: ../gio/gdbusmessage.c:2660 +#: ../gio/gdbusmessage.c:2662 msgid "Cannot serialize message: " msgstr "" -#: ../gio/gdbusmessage.c:2704 +#: ../gio/gdbusmessage.c:2706 #, c-format msgid "Message body has signature “%s†but there is no signature header" msgstr "" -#: ../gio/gdbusmessage.c:2714 +#: ../gio/gdbusmessage.c:2716 #, c-format msgid "" "Message body has type signature “%s†but signature in the header field is " "“%sâ€" msgstr "" -#: ../gio/gdbusmessage.c:2730 +#: ../gio/gdbusmessage.c:2732 #, c-format msgid "Message body is empty but signature in the header field is “(%s)â€" msgstr "" -#: ../gio/gdbusmessage.c:3283 +#: ../gio/gdbusmessage.c:3285 #, c-format msgid "Error return with body of type “%sâ€" msgstr "" -#: ../gio/gdbusmessage.c:3291 +#: ../gio/gdbusmessage.c:3293 msgid "Error return with empty body" msgstr "" -#: ../gio/gdbusprivate.c:2038 +#: ../gio/gdbusprivate.c:2066 #, c-format msgid "Unable to get Hardware profile: %s" msgstr "" -#: ../gio/gdbusprivate.c:2083 +#: ../gio/gdbusprivate.c:2111 msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: " msgstr "" @@ -883,7 +873,7 @@ msgstr "" msgid "Unexpected reply %d from StartServiceByName(\"%s\") method" msgstr "" -#: ../gio/gdbusproxy.c:2713 ../gio/gdbusproxy.c:2847 +#: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853 msgid "" "Cannot invoke method; proxy is for a well-known name without an owner and " "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag" @@ -921,257 +911,296 @@ msgid "" " monitor Monitor a remote object\n" " call Invoke a method on a remote object\n" " emit Emit a signal\n" +" wait Wait for a bus name to appear\n" "\n" "Use “%s COMMAND --help†to get help on each command.\n" msgstr "" -#: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298 -#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067 -#: ../gio/gdbus-tool.c:1509 ../gio/gio-tool-rename.c:84 +#: ../gio/gdbus-tool.c:165 ../gio/gdbus-tool.c:227 ../gio/gdbus-tool.c:299 +#: ../gio/gdbus-tool.c:323 ../gio/gdbus-tool.c:725 ../gio/gdbus-tool.c:1068 +#: ../gio/gdbus-tool.c:1510 #, c-format msgid "Error: %s\n" msgstr "Қате: %s\n" -#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1525 +#: ../gio/gdbus-tool.c:176 ../gio/gdbus-tool.c:240 ../gio/gdbus-tool.c:1526 #, c-format msgid "Error parsing introspection XML: %s\n" msgstr "" -#: ../gio/gdbus-tool.c:208 +#: ../gio/gdbus-tool.c:209 #, c-format msgid "Error: %s is not a valid name\n" msgstr "" -#: ../gio/gdbus-tool.c:356 +#: ../gio/gdbus-tool.c:357 msgid "Connect to the system bus" msgstr "" -#: ../gio/gdbus-tool.c:357 +#: ../gio/gdbus-tool.c:358 msgid "Connect to the session bus" msgstr "" -#: ../gio/gdbus-tool.c:358 +#: ../gio/gdbus-tool.c:359 msgid "Connect to given D-Bus address" msgstr "" -#: ../gio/gdbus-tool.c:368 +#: ../gio/gdbus-tool.c:369 msgid "Connection Endpoint Options:" msgstr "" -#: ../gio/gdbus-tool.c:369 +#: ../gio/gdbus-tool.c:370 msgid "Options specifying the connection endpoint" msgstr "" -#: ../gio/gdbus-tool.c:391 +#: ../gio/gdbus-tool.c:392 #, c-format msgid "No connection endpoint specified" msgstr "" -#: ../gio/gdbus-tool.c:401 +#: ../gio/gdbus-tool.c:402 #, c-format msgid "Multiple connection endpoints specified" msgstr "" -#: ../gio/gdbus-tool.c:471 +#: ../gio/gdbus-tool.c:472 #, c-format msgid "" "Warning: According to introspection data, interface “%s†does not exist\n" msgstr "" -#: ../gio/gdbus-tool.c:480 +#: ../gio/gdbus-tool.c:481 #, c-format msgid "" "Warning: According to introspection data, method “%s†does not exist on " "interface “%sâ€\n" msgstr "" -#: ../gio/gdbus-tool.c:542 +#: ../gio/gdbus-tool.c:543 msgid "Optional destination for signal (unique name)" msgstr "" -#: ../gio/gdbus-tool.c:543 +#: ../gio/gdbus-tool.c:544 msgid "Object path to emit signal on" msgstr "" -#: ../gio/gdbus-tool.c:544 +#: ../gio/gdbus-tool.c:545 msgid "Signal and interface name" msgstr "" -#: ../gio/gdbus-tool.c:578 +#: ../gio/gdbus-tool.c:579 msgid "Emit a signal." msgstr "Сигналды жіберу." -#: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615 -#: ../gio/gdbus-tool.c:1850 +#: ../gio/gdbus-tool.c:613 ../gio/gdbus-tool.c:858 ../gio/gdbus-tool.c:1616 +#: ../gio/gdbus-tool.c:1851 ../gio/gdbus-tool.c:2067 #, c-format msgid "Error connecting: %s\n" msgstr "БайланыÑу қатеÑÑ–: %s\n" -#: ../gio/gdbus-tool.c:624 +#: ../gio/gdbus-tool.c:625 #, c-format msgid "Error: object path not specified.\n" msgstr "" -#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:924 ../gio/gdbus-tool.c:1680 -#: ../gio/gdbus-tool.c:1916 +#: ../gio/gdbus-tool.c:630 ../gio/gdbus-tool.c:925 ../gio/gdbus-tool.c:1681 +#: ../gio/gdbus-tool.c:1917 #, c-format msgid "Error: %s is not a valid object path\n" msgstr "" -#: ../gio/gdbus-tool.c:635 +#: ../gio/gdbus-tool.c:636 #, c-format msgid "Error: signal not specified.\n" msgstr "Қате: Ñигнал көрÑетілмеген.\n" -#: ../gio/gdbus-tool.c:642 +#: ../gio/gdbus-tool.c:643 #, c-format msgid "Error: signal must be the fully-qualified name.\n" msgstr "" -#: ../gio/gdbus-tool.c:650 +#: ../gio/gdbus-tool.c:651 #, c-format msgid "Error: %s is not a valid interface name\n" msgstr "" -#: ../gio/gdbus-tool.c:656 +#: ../gio/gdbus-tool.c:657 #, c-format msgid "Error: %s is not a valid member name\n" msgstr "" -#: ../gio/gdbus-tool.c:662 +#: ../gio/gdbus-tool.c:663 #, c-format msgid "Error: %s is not a valid unique bus name.\n" msgstr "" #. Use the original non-"parse-me-harder" error -#: ../gio/gdbus-tool.c:699 ../gio/gdbus-tool.c:1036 +#: ../gio/gdbus-tool.c:700 ../gio/gdbus-tool.c:1037 #, c-format msgid "Error parsing parameter %d: %s\n" msgstr "" -#: ../gio/gdbus-tool.c:731 +#: ../gio/gdbus-tool.c:732 #, c-format msgid "Error flushing connection: %s\n" msgstr "" -#: ../gio/gdbus-tool.c:758 +#: ../gio/gdbus-tool.c:759 msgid "Destination name to invoke method on" msgstr "" -#: ../gio/gdbus-tool.c:759 +#: ../gio/gdbus-tool.c:760 msgid "Object path to invoke method on" msgstr "" -#: ../gio/gdbus-tool.c:760 +#: ../gio/gdbus-tool.c:761 msgid "Method and interface name" msgstr "" -#: ../gio/gdbus-tool.c:761 +#: ../gio/gdbus-tool.c:762 msgid "Timeout in seconds" msgstr "" -#: ../gio/gdbus-tool.c:802 +#: ../gio/gdbus-tool.c:803 msgid "Invoke a method on a remote object." msgstr "" -#: ../gio/gdbus-tool.c:877 ../gio/gdbus-tool.c:1634 ../gio/gdbus-tool.c:1869 +#: ../gio/gdbus-tool.c:878 ../gio/gdbus-tool.c:1635 ../gio/gdbus-tool.c:1870 #, c-format msgid "Error: Destination is not specified\n" msgstr "" -#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1651 ../gio/gdbus-tool.c:1881 +#: ../gio/gdbus-tool.c:890 ../gio/gdbus-tool.c:1652 ../gio/gdbus-tool.c:1882 #, c-format msgid "Error: %s is not a valid bus name\n" msgstr "" -#: ../gio/gdbus-tool.c:904 ../gio/gdbus-tool.c:1660 +#: ../gio/gdbus-tool.c:905 ../gio/gdbus-tool.c:1661 #, c-format msgid "Error: Object path is not specified\n" msgstr "" -#: ../gio/gdbus-tool.c:939 +#: ../gio/gdbus-tool.c:940 #, c-format msgid "Error: Method name is not specified\n" msgstr "" -#: ../gio/gdbus-tool.c:950 +#: ../gio/gdbus-tool.c:951 #, c-format msgid "Error: Method name “%s†is invalid\n" msgstr "" -#: ../gio/gdbus-tool.c:1028 +#: ../gio/gdbus-tool.c:1029 #, c-format msgid "Error parsing parameter %d of type “%sâ€: %s\n" msgstr "" -#: ../gio/gdbus-tool.c:1472 +#: ../gio/gdbus-tool.c:1473 msgid "Destination name to introspect" msgstr "" -#: ../gio/gdbus-tool.c:1473 +#: ../gio/gdbus-tool.c:1474 msgid "Object path to introspect" msgstr "" -#: ../gio/gdbus-tool.c:1474 +#: ../gio/gdbus-tool.c:1475 msgid "Print XML" msgstr "XML баÑпаға шығару" -#: ../gio/gdbus-tool.c:1475 +#: ../gio/gdbus-tool.c:1476 msgid "Introspect children" msgstr "" -#: ../gio/gdbus-tool.c:1476 +#: ../gio/gdbus-tool.c:1477 msgid "Only print properties" msgstr "Тек қаÑиеттерін баÑпаға шығару" -#: ../gio/gdbus-tool.c:1567 +#: ../gio/gdbus-tool.c:1568 msgid "Introspect a remote object." msgstr "" -#: ../gio/gdbus-tool.c:1772 +#: ../gio/gdbus-tool.c:1773 msgid "Destination name to monitor" msgstr "Бақылау үшін мақÑат атауы" -#: ../gio/gdbus-tool.c:1773 +#: ../gio/gdbus-tool.c:1774 msgid "Object path to monitor" msgstr "" -#: ../gio/gdbus-tool.c:1802 +#: ../gio/gdbus-tool.c:1803 msgid "Monitor a remote object." msgstr "" -#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501 +#: ../gio/gdbus-tool.c:1980 +msgid "Service to activate before waiting for the other one (well-known name)" +msgstr "" + +#: ../gio/gdbus-tool.c:1983 +msgid "" +"Timeout to wait for before exiting with an error (seconds); 0 for no timeout " +"(default)" +msgstr "" + +#: ../gio/gdbus-tool.c:2031 +msgid "[OPTION…] BUS-NAME" +msgstr "[ОПЦИЯ…] ШИÐÐ-ÐТЫ" + +#: ../gio/gdbus-tool.c:2033 +msgid "Wait for a bus name to appear." +msgstr "" + +#: ../gio/gdbus-tool.c:2109 +#, c-format +msgid "Error: A service to activate for must be specified.\n" +msgstr "Қате: белÑендіру үшін қызмет көрÑетілуі керек.\n" + +#: ../gio/gdbus-tool.c:2114 +#, c-format +msgid "Error: A service to wait for must be specified.\n" +msgstr "Қате: күту үшін қызмет көрÑетілуі керек.\n" + +#: ../gio/gdbus-tool.c:2119 +#, c-format +msgid "Error: Too many arguments.\n" +msgstr "" + +#: ../gio/gdbus-tool.c:2127 ../gio/gdbus-tool.c:2134 +#, c-format +msgid "Error: %s is not a valid well-known bus name.\n" +msgstr "Қате: \"%s\" - кеңінен белгілі шина аты емеÑ.\n" + +#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4533 msgid "Unnamed" msgstr "ÐтауÑыз" -#: ../gio/gdesktopappinfo.c:2404 +#: ../gio/gdesktopappinfo.c:2411 msgid "Desktop file didn’t specify Exec field" msgstr "" -#: ../gio/gdesktopappinfo.c:2689 +#: ../gio/gdesktopappinfo.c:2696 msgid "Unable to find terminal required for application" msgstr "" -#: ../gio/gdesktopappinfo.c:3097 +#: ../gio/gdesktopappinfo.c:3129 #, c-format msgid "Can’t create user application configuration folder %s: %s" msgstr "" -#: ../gio/gdesktopappinfo.c:3101 +#: ../gio/gdesktopappinfo.c:3133 #, c-format msgid "Can’t create user MIME configuration folder %s: %s" msgstr "" -#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365 +#: ../gio/gdesktopappinfo.c:3373 ../gio/gdesktopappinfo.c:3397 msgid "Application information lacks an identifier" msgstr "" -#: ../gio/gdesktopappinfo.c:3599 +#: ../gio/gdesktopappinfo.c:3631 #, c-format msgid "Can’t create user desktop file %s" msgstr "%s пайдаланушы Ð¶Ò±Ð¼Ñ‹Ñ Ò¯Ñтел файлын жаÑау мүмкін емеÑ" -#: ../gio/gdesktopappinfo.c:3733 +#: ../gio/gdesktopappinfo.c:3765 #, c-format msgid "Custom definition for %s" msgstr "" @@ -1235,11 +1264,11 @@ msgstr "" #: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901 -#: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659 -#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405 -#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991 -#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276 -#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991 +#: ../gio/gfile.c:1956 ../gio/gfile.c:3609 ../gio/gfile.c:3664 +#: ../gio/gfile.c:3900 ../gio/gfile.c:3942 ../gio/gfile.c:4410 +#: ../gio/gfile.c:4821 ../gio/gfile.c:4906 ../gio/gfile.c:4996 +#: ../gio/gfile.c:5093 ../gio/gfile.c:5180 ../gio/gfile.c:5281 +#: ../gio/gfile.c:7822 ../gio/gfile.c:7912 ../gio/gfile.c:7996 #: ../gio/win32/gwinhttpfile.c:437 msgid "Operation not supported" msgstr "Әрекетке қолдау жоқ" @@ -1268,49 +1297,49 @@ msgstr "МақÑат файлы бар болып тұр" msgid "Can’t recursively copy directory" msgstr "Буманы рекурÑивті көшіру мүмкін емеÑ" -#: ../gio/gfile.c:2884 +#: ../gio/gfile.c:2889 msgid "Splice not supported" msgstr "" -#: ../gio/gfile.c:2888 +#: ../gio/gfile.c:2893 #, c-format msgid "Error splicing file: %s" msgstr "" -#: ../gio/gfile.c:3019 +#: ../gio/gfile.c:3024 msgid "Copy (reflink/clone) between mounts is not supported" msgstr "" -#: ../gio/gfile.c:3023 +#: ../gio/gfile.c:3028 msgid "Copy (reflink/clone) is not supported or invalid" msgstr "" -#: ../gio/gfile.c:3028 +#: ../gio/gfile.c:3033 msgid "Copy (reflink/clone) is not supported or didn’t work" msgstr "" -#: ../gio/gfile.c:3091 +#: ../gio/gfile.c:3096 msgid "Can’t copy special file" msgstr "" -#: ../gio/gfile.c:3885 +#: ../gio/gfile.c:3890 msgid "Invalid symlink value given" msgstr "" -#: ../gio/gfile.c:4046 +#: ../gio/gfile.c:4051 msgid "Trash not supported" msgstr "" -#: ../gio/gfile.c:4158 +#: ../gio/gfile.c:4163 #, c-format msgid "File names cannot contain “%câ€" msgstr "" -#: ../gio/gfile.c:6604 ../gio/gvolume.c:363 +#: ../gio/gfile.c:6609 ../gio/gvolume.c:363 msgid "volume doesn’t implement mount" msgstr "" -#: ../gio/gfile.c:6713 +#: ../gio/gfile.c:6718 msgid "No application is registered as handling this file" msgstr "" @@ -1355,28 +1384,33 @@ msgstr "" msgid "Truncate not supported on stream" msgstr "" -#: ../gio/ghttpproxy.c:136 +#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476 +#: ../glib/gconvert.c:1650 +msgid "Invalid hostname" +msgstr "ХоÑÑ‚ аты қате" + +#: ../gio/ghttpproxy.c:143 msgid "Bad HTTP proxy reply" msgstr "" -#: ../gio/ghttpproxy.c:152 +#: ../gio/ghttpproxy.c:159 msgid "HTTP proxy connection not allowed" msgstr "" -#: ../gio/ghttpproxy.c:157 +#: ../gio/ghttpproxy.c:164 msgid "HTTP proxy authentication failed" msgstr "" -#: ../gio/ghttpproxy.c:160 +#: ../gio/ghttpproxy.c:167 msgid "HTTP proxy authentication required" msgstr "" -#: ../gio/ghttpproxy.c:164 +#: ../gio/ghttpproxy.c:171 #, c-format msgid "HTTP proxy connection failed: %i" msgstr "" -#: ../gio/ghttpproxy.c:260 +#: ../gio/ghttpproxy.c:269 msgid "HTTP proxy server closed connection unexpectedly." msgstr "" @@ -1433,7 +1467,7 @@ msgid "Could not parse “%s†as IP address mask" msgstr "" #: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220 -#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216 +#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218 msgid "Not enough space for socket address" msgstr "" @@ -1456,109 +1490,113 @@ msgstr "" msgid "Stream has outstanding operation" msgstr "" -#: ../gio/gio-tool.c:142 +#: ../gio/gio-tool.c:160 msgid "Copy with file" msgstr "" -#: ../gio/gio-tool.c:146 +#: ../gio/gio-tool.c:164 msgid "Keep with file when moved" msgstr "" -#: ../gio/gio-tool.c:187 +#: ../gio/gio-tool.c:205 msgid "“version†takes no arguments" msgstr "\"version\" аргументтерді қабылдамайды" -#: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857 +#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857 msgid "Usage:" msgstr "Қолданылуы:" -#: ../gio/gio-tool.c:192 +#: ../gio/gio-tool.c:210 msgid "Print version information and exit." msgstr "ÐÒ±Ñқа ақпаратын шығару және шығу." -#: ../gio/gio-tool.c:206 +#: ../gio/gio-tool.c:224 msgid "[ARGS...]" msgstr "[ÐРГУМЕÐТТЕР...]" -#: ../gio/gio-tool.c:208 +#: ../gio/gio-tool.c:226 msgid "Commands:" msgstr "Командалар:" -#: ../gio/gio-tool.c:211 +#: ../gio/gio-tool.c:229 msgid "Concatenate files to standard output" msgstr "" -#: ../gio/gio-tool.c:212 +#: ../gio/gio-tool.c:230 msgid "Copy one or more files" msgstr "Бір немеÑе бірнеше файлды көшіру" -#: ../gio/gio-tool.c:213 +#: ../gio/gio-tool.c:231 msgid "Show information about locations" msgstr "ОрналаÑулар жөнінде ақпаратты көрÑету" -#: ../gio/gio-tool.c:214 +#: ../gio/gio-tool.c:232 msgid "List the contents of locations" msgstr "" -#: ../gio/gio-tool.c:215 +#: ../gio/gio-tool.c:233 msgid "Get or set the handler for a mimetype" msgstr "" -#: ../gio/gio-tool.c:216 +#: ../gio/gio-tool.c:234 msgid "Create directories" msgstr "Бумаларды жаÑау" -#: ../gio/gio-tool.c:217 +#: ../gio/gio-tool.c:235 msgid "Monitor files and directories for changes" msgstr "Файлдар және бумаларды өзгеріÑтерге бақылау" -#: ../gio/gio-tool.c:218 +#: ../gio/gio-tool.c:236 msgid "Mount or unmount the locations" msgstr "ОрналаÑуларды тіркеу немеÑе тіркеуден боÑату" -#: ../gio/gio-tool.c:219 +#: ../gio/gio-tool.c:237 msgid "Move one or more files" msgstr "Бір немеÑе бірнеше файлды жылжыту" -#: ../gio/gio-tool.c:220 +#: ../gio/gio-tool.c:238 msgid "Open files with the default application" msgstr "Файлдарды үнÑіз келіÑім қолданбаÑымен ашу" -#: ../gio/gio-tool.c:221 +#: ../gio/gio-tool.c:239 msgid "Rename a file" msgstr "Файл атын ауыÑтыру" -#: ../gio/gio-tool.c:222 +#: ../gio/gio-tool.c:240 msgid "Delete one or more files" msgstr "Бір немеÑе бірнеше файлды өшіру" -#: ../gio/gio-tool.c:223 +#: ../gio/gio-tool.c:241 msgid "Read from standard input and save" msgstr "Қалыпты кіріÑтен оқу және Ñақтау" -#: ../gio/gio-tool.c:224 +#: ../gio/gio-tool.c:242 msgid "Set a file attribute" msgstr "Файл атрибутын орнату" -#: ../gio/gio-tool.c:225 +#: ../gio/gio-tool.c:243 msgid "Move files or directories to the trash" msgstr "Файлдар немеÑе бумаларды Ò›Ð¾Ò›Ñ‹Ñ ÑˆÐµÐ»ÐµÐ³Ñ–Ð½Ðµ таÑтау" -#: ../gio/gio-tool.c:226 +#: ../gio/gio-tool.c:244 msgid "Lists the contents of locations in a tree" msgstr "" -#: ../gio/gio-tool.c:228 +#: ../gio/gio-tool.c:246 #, c-format msgid "Use %s to get detailed help.\n" msgstr "" +#: ../gio/gio-tool-cat.c:80 +msgid "Error writing to stdout" +msgstr "Қалыпты шығыÑқа жазу қатеÑÑ–" + #. Translators: commandline placeholder -#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:278 +#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:282 #: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48 #: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39 #: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43 -#: ../gio/gio-tool-monitor.c:202 ../gio/gio-tool-mount.c:1132 +#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141 #: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48 #: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89 #: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239 @@ -1576,9 +1614,11 @@ msgid "" "like smb://server/resource/file.txt as location." msgstr "" -#: ../gio/gio-tool-cat.c:151 -msgid "No files given" -msgstr "Файлдар көрÑетілмеген" +#: ../gio/gio-tool-cat.c:153 ../gio/gio-tool-info.c:313 +#: ../gio/gio-tool-mkdir.c:76 ../gio/gio-tool-monitor.c:228 +#: ../gio/gio-tool-open.c:71 ../gio/gio-tool-remove.c:72 +msgid "No locations given" +msgstr "" #: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38 msgid "No target directory" @@ -1603,7 +1643,7 @@ msgstr "Бар болып тұрған мақÑат файлдардың қор #: ../gio/gio-tool-copy.c:47 msgid "Never follow symbolic links" -msgstr "" +msgstr "Символдық Ñілтемелер Ñоңынан ермеу" #: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67 #, c-format @@ -1632,12 +1672,12 @@ msgid "" "like smb://server/resource/file.txt as location." msgstr "" -#: ../gio/gio-tool-copy.c:143 +#: ../gio/gio-tool-copy.c:147 #, c-format msgid "Destination %s is not a directory" msgstr "%s мақÑаты бума емеÑ" -#: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181 +#: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185 #, c-format msgid "%s: overwrite “%sâ€? " msgstr "%s: \"%s\" Ò¯Ñтінен жазу керек пе? " @@ -1704,26 +1744,21 @@ msgstr "жаÑырын\n" msgid "uri: %s\n" msgstr "uri: %s\n" -#: ../gio/gio-tool-info.c:221 -#, c-format -msgid "Error getting writable attributes: %s\n" -msgstr "" - -#: ../gio/gio-tool-info.c:226 +#: ../gio/gio-tool-info.c:228 #, c-format msgid "Settable attributes:\n" -msgstr "" +msgstr "Орнатуға болатын атрибуттар:\n" -#: ../gio/gio-tool-info.c:249 +#: ../gio/gio-tool-info.c:252 #, c-format msgid "Writable attribute namespaces:\n" msgstr "" -#: ../gio/gio-tool-info.c:283 +#: ../gio/gio-tool-info.c:287 msgid "Show information about locations." msgstr "ОрналаÑулар жөнінде ақпаратты көрÑету." -#: ../gio/gio-tool-info.c:285 +#: ../gio/gio-tool-info.c:289 msgid "" "gio info is similar to the traditional ls utility, but using GIO\n" "locations instead of local files: for example, you can use something\n" @@ -1732,10 +1767,6 @@ msgid "" "namespace, e.g. unix, or by “*â€, which matches all attributes" msgstr "" -#: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74 -msgid "No locations given" -msgstr "" - #: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32 msgid "Show hidden files" msgstr "ЖаÑырын файлдарды көрÑету" @@ -1746,11 +1777,11 @@ msgstr "" #: ../gio/gio-tool-list.c:39 msgid "Print full URIs" -msgstr "" +msgstr "Толық URI шығару" #: ../gio/gio-tool-list.c:170 msgid "List the contents of the locations." -msgstr "" +msgstr "ОрналаÑулар құрамаларын тізіп шығару." #: ../gio/gio-tool-list.c:172 msgid "" @@ -1780,46 +1811,47 @@ msgid "" "handler for the mimetype." msgstr "" -#: ../gio/gio-tool-mime.c:98 +#: ../gio/gio-tool-mime.c:100 msgid "Must specify a single mimetype, and maybe a handler" msgstr "" -#: ../gio/gio-tool-mime.c:113 +#: ../gio/gio-tool-mime.c:116 #, c-format msgid "No default applications for “%sâ€\n" msgstr "" -#: ../gio/gio-tool-mime.c:119 +#: ../gio/gio-tool-mime.c:122 #, c-format msgid "Default application for “%sâ€: %s\n" msgstr "" -#: ../gio/gio-tool-mime.c:124 +#: ../gio/gio-tool-mime.c:127 #, c-format msgid "Registered applications:\n" msgstr "Тіркелген қолданбалар:\n" -#: ../gio/gio-tool-mime.c:126 +#: ../gio/gio-tool-mime.c:129 #, c-format msgid "No registered applications\n" msgstr "Тіркелген қолданбалар жоқ\n" -#: ../gio/gio-tool-mime.c:137 +#: ../gio/gio-tool-mime.c:140 #, c-format msgid "Recommended applications:\n" msgstr "Ò°Ñынылатын қолданбалар:\n" -#: ../gio/gio-tool-mime.c:139 +#: ../gio/gio-tool-mime.c:142 #, c-format msgid "No recommended applications\n" msgstr "Ò°Ñынылатын қолданбалар жоқ\n" -#: ../gio/gio-tool-mime.c:159 +#: ../gio/gio-tool-mime.c:162 #, c-format -msgid "Failed to load info for handler “%sâ€\n" +#| msgid "Failed to read from file “%sâ€: %s" +msgid "Failed to load info for handler “%sâ€" msgstr "" -#: ../gio/gio-tool-mime.c:165 +#: ../gio/gio-tool-mime.c:168 #, c-format msgid "Failed to set “%s†as the default handler for “%sâ€: %s\n" msgstr "" @@ -1830,7 +1862,7 @@ msgstr "Ðталық бумаларын жаÑау" #: ../gio/gio-tool-mkdir.c:52 msgid "Create directories." -msgstr "Бумаларды жаÑау" +msgstr "Бумаларды жаÑау." #: ../gio/gio-tool-mkdir.c:54 msgid "" @@ -1863,13 +1895,13 @@ msgstr "" msgid "Watch for mount events" msgstr "" -#: ../gio/gio-tool-monitor.c:207 +#: ../gio/gio-tool-monitor.c:208 msgid "Monitor files or directories for changes." msgstr "" #: ../gio/gio-tool-mount.c:58 msgid "Mount as mountable" -msgstr "" +msgstr "Тіркелетін ретінде тіркеу" #: ../gio/gio-tool-mount.c:59 msgid "Mount volume with device file" @@ -1877,7 +1909,7 @@ msgstr "" #: ../gio/gio-tool-mount.c:59 msgid "DEVICE" -msgstr "" +msgstr "ҚҰРЫЛҒЫ" #: ../gio/gio-tool-mount.c:60 msgid "Unmount" @@ -1893,7 +1925,7 @@ msgstr "" #: ../gio/gio-tool-mount.c:62 msgid "SCHEME" -msgstr "" +msgstr "СХЕМÐ" #: ../gio/gio-tool-mount.c:63 msgid "Ignore outstanding file operations when unmounting or ejecting" @@ -1917,46 +1949,19 @@ msgid "Show extra information" msgstr "ҚоÑымша ақпаратты көрÑету" #: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276 -#, c-format -msgid "Error mounting location: Anonymous access denied\n" +msgid "Anonymous access denied" msgstr "" -#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:278 -#, c-format -msgid "Error mounting location: %s\n" -msgstr "ОрналаÑуды тіркеу қатеÑÑ–: %s\n" - -#: ../gio/gio-tool-mount.c:341 -#, c-format -msgid "Error unmounting mount: %s\n" -msgstr "Тіркеуден боÑату қатеÑÑ–: %s\n" - -#: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419 -#, c-format -msgid "Error finding enclosing mount: %s\n" -msgstr "" - -#: ../gio/gio-tool-mount.c:394 -#, c-format -msgid "Error ejecting mount: %s\n" -msgstr "" - -#: ../gio/gio-tool-mount.c:875 -#, c-format -msgid "Error mounting %s: %s\n" -msgstr "%s тіркеу қатеÑÑ–: %s\n" - -#: ../gio/gio-tool-mount.c:891 +#: ../gio/gio-tool-mount.c:897 #, c-format msgid "Mounted %s at %s\n" msgstr "" -#: ../gio/gio-tool-mount.c:941 -#, c-format -msgid "No volume for device file %s\n" +#: ../gio/gio-tool-mount.c:950 +msgid "No volume for device file" msgstr "" -#: ../gio/gio-tool-mount.c:1136 +#: ../gio/gio-tool-mount.c:1145 msgid "Mount or unmount the locations." msgstr "ОрналаÑуларды тіркеу немеÑе тіркеуден шығару." @@ -1975,7 +1980,7 @@ msgid "" "like smb://server/resource/file.txt as location" msgstr "" -#: ../gio/gio-tool-move.c:139 +#: ../gio/gio-tool-move.c:142 #, c-format msgid "Target %s is not a directory" msgstr "%s мақÑаты бума ÐµÐ¼ÐµÑ Ð±Ð¾Ð»Ñ‹Ð¿ тұр" @@ -1986,10 +1991,6 @@ msgid "" "is registered to handle files of this type." msgstr "" -#: ../gio/gio-tool-open.c:69 -msgid "No files to open" -msgstr "Ðшу үшін файлдар жоқ" - #: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31 msgid "Ignore nonexistent files, never prompt" msgstr "" @@ -1998,10 +1999,6 @@ msgstr "" msgid "Delete the given files." msgstr "КөрÑетілген файлдарды өшіру." -#: ../gio/gio-tool-remove.c:70 -msgid "No files to delete" -msgstr "Өшіру үшін файлдар жоқ" - #: ../gio/gio-tool-rename.c:45 msgid "NAME" msgstr "ÐТЫ" @@ -2010,35 +2007,35 @@ msgstr "ÐТЫ" msgid "Rename a file." msgstr "Файл атын ауыÑтыру." -#: ../gio/gio-tool-rename.c:68 +#: ../gio/gio-tool-rename.c:70 msgid "Missing argument" -msgstr "Ðргумент жетіÑпейді." +msgstr "Ðргумент жетіÑпейді" -#: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192 -#: ../gio/gio-tool-set.c:134 +#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:195 +#: ../gio/gio-tool-set.c:137 msgid "Too many arguments" msgstr "" -#: ../gio/gio-tool-rename.c:91 +#: ../gio/gio-tool-rename.c:95 #, c-format msgid "Rename successful. New uri: %s\n" msgstr "" #: ../gio/gio-tool-save.c:50 msgid "Only create if not existing" -msgstr "" +msgstr "Жоқ болÑа ғана жаÑау" #: ../gio/gio-tool-save.c:51 msgid "Append to end of file" -msgstr "" +msgstr "Файл Ñоңына жалғау" #: ../gio/gio-tool-save.c:52 msgid "When creating, restrict access to the current user" -msgstr "" +msgstr "ЖаÑау кезінде, Ñ€Ò±Ò›Ñатты ағымдағы пайдаланушымен шектеу" #: ../gio/gio-tool-save.c:53 msgid "When replacing, replace as if the destination did not exist" -msgstr "" +msgstr "ÐлмаÑтыру кезінде, мақÑат жоқ болып тұрғандай алмаÑтыру" #. Translators: The "etag" is a token allowing to verify whether a file has been modified #: ../gio/gio-tool-save.c:55 @@ -2054,6 +2051,10 @@ msgstr "" msgid "ETAG" msgstr "" +#: ../gio/gio-tool-save.c:119 +msgid "Error reading from standard input" +msgstr "Қалыпты кіріÑтен оқу қатеÑÑ–" + #. Translators: The "etag" is a token allowing to verify whether a file has been modified #: ../gio/gio-tool-save.c:145 #, c-format @@ -2062,15 +2063,15 @@ msgstr "Etag қолжетерÑіз\n" #: ../gio/gio-tool-save.c:168 msgid "Read from standard input and save to DEST." -msgstr "" +msgstr "Стандартты кіріÑтен оқу және ÐœÐҚСÐТҚРÑақтау." -#: ../gio/gio-tool-save.c:186 +#: ../gio/gio-tool-save.c:188 msgid "No destination given" msgstr "" #: ../gio/gio-tool-set.c:33 msgid "Type of the attribute" -msgstr "" +msgstr "Ðтрибут түрі" #: ../gio/gio-tool-set.c:33 msgid "TYPE" @@ -2086,29 +2087,24 @@ msgstr "МӘÐІ" #: ../gio/gio-tool-set.c:93 msgid "Set a file attribute of LOCATION." -msgstr "" +msgstr "ОРÐÐЛÐСУДЫҢ файл атрибутын орнату." -#: ../gio/gio-tool-set.c:111 +#: ../gio/gio-tool-set.c:113 msgid "Location not specified" msgstr "ОрналаÑу көрÑетілмеген" -#: ../gio/gio-tool-set.c:119 +#: ../gio/gio-tool-set.c:120 msgid "Attribute not specified" msgstr "" -#: ../gio/gio-tool-set.c:128 +#: ../gio/gio-tool-set.c:130 msgid "Value not specified" msgstr "" -#: ../gio/gio-tool-set.c:176 +#: ../gio/gio-tool-set.c:180 #, c-format -msgid "Invalid attribute type %s\n" -msgstr "Қате атрибут түрі %s\n" - -#: ../gio/gio-tool-set.c:189 -#, c-format -msgid "Error setting attribute: %s\n" -msgstr "Ðтрибутты орнату қатеÑÑ–: %s\n" +msgid "Invalid attribute type “%sâ€" +msgstr "Қате атрибут түрі \"%s\"" #: ../gio/gio-tool-trash.c:32 msgid "Empty the trash" @@ -2116,17 +2112,17 @@ msgstr "ÒšÐ¾Ò›Ñ‹Ñ ÑˆÐµÐ»ÐµÐ³Ñ–Ð½ тазарту" #: ../gio/gio-tool-trash.c:86 msgid "Move files or directories to the trash." -msgstr "" +msgstr "Файлдар не бумаларды Ò›Ð¾Ò›Ñ‹Ñ ÑˆÐµÐ»ÐµÐ³Ñ–Ð½Ðµ жылжыту." #: ../gio/gio-tool-tree.c:33 msgid "Follow symbolic links, mounts and shortcuts" -msgstr "" +msgstr "Символдық Ñілтемелер, тіркеулер және жарлықтар Ñоңынан еру" #: ../gio/gio-tool-tree.c:244 msgid "List contents of directories in a tree-like format." -msgstr "" +msgstr "Бумалар құрамаларын ағаш Ñ‚ÐµÐºÑ‚ÐµÑ Ð¿Ñ–ÑˆÑ–Ð¼Ð´Ðµ шығару." -#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1491 +#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1492 #, c-format msgid "Element <%s> not allowed inside <%s>" msgstr "<%s> Ñлементін <%s> ішінде орналаÑтыру Ñ€Ò±Ò›Ñат етілмеген" @@ -2171,12 +2167,12 @@ msgstr "%s файлын оқу қатеÑÑ–: %s" msgid "Error compressing file %s" msgstr "%s файлын Ñығу қатеÑÑ–" -#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603 +#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1604 #, c-format msgid "text may not appear inside <%s>" msgstr "мәтін <%s> ішінде болмауы мүмкін" -#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2037 +#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2053 msgid "Show program version and exit" msgstr "" @@ -2190,8 +2186,8 @@ msgid "" "directory)" msgstr "" -#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2038 -#: ../gio/glib-compile-schemas.c:2067 +#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2054 +#: ../gio/glib-compile-schemas.c:2082 msgid "DIRECTORY" msgstr "БУМÐ" @@ -2275,219 +2271,219 @@ msgstr "" msgid "invalid name '%s': maximum length is 1024" msgstr "" -#: ../gio/glib-compile-schemas.c:901 +#: ../gio/glib-compile-schemas.c:902 #, c-format msgid "<child name='%s'> already specified" msgstr "" -#: ../gio/glib-compile-schemas.c:927 +#: ../gio/glib-compile-schemas.c:928 msgid "cannot add keys to a 'list-of' schema" msgstr "" -#: ../gio/glib-compile-schemas.c:938 +#: ../gio/glib-compile-schemas.c:939 #, c-format msgid "<key name='%s'> already specified" msgstr "" -#: ../gio/glib-compile-schemas.c:956 +#: ../gio/glib-compile-schemas.c:957 #, c-format msgid "" "<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> " "to modify value" msgstr "" -#: ../gio/glib-compile-schemas.c:967 +#: ../gio/glib-compile-schemas.c:968 #, c-format msgid "" "exactly one of 'type', 'enum' or 'flags' must be specified as an attribute " "to <key>" msgstr "" -#: ../gio/glib-compile-schemas.c:986 +#: ../gio/glib-compile-schemas.c:987 #, c-format msgid "<%s id='%s'> not (yet) defined." msgstr "" -#: ../gio/glib-compile-schemas.c:1001 +#: ../gio/glib-compile-schemas.c:1002 #, c-format msgid "invalid GVariant type string '%s'" msgstr "" -#: ../gio/glib-compile-schemas.c:1031 +#: ../gio/glib-compile-schemas.c:1032 msgid "<override> given but schema isn't extending anything" msgstr "" -#: ../gio/glib-compile-schemas.c:1044 +#: ../gio/glib-compile-schemas.c:1045 #, c-format msgid "no <key name='%s'> to override" msgstr "" -#: ../gio/glib-compile-schemas.c:1052 +#: ../gio/glib-compile-schemas.c:1053 #, c-format msgid "<override name='%s'> already specified" msgstr "" -#: ../gio/glib-compile-schemas.c:1125 +#: ../gio/glib-compile-schemas.c:1126 #, c-format msgid "<schema id='%s'> already specified" msgstr "" -#: ../gio/glib-compile-schemas.c:1137 +#: ../gio/glib-compile-schemas.c:1138 #, c-format msgid "<schema id='%s'> extends not yet existing schema '%s'" msgstr "" -#: ../gio/glib-compile-schemas.c:1153 +#: ../gio/glib-compile-schemas.c:1154 #, c-format msgid "<schema id='%s'> is list of not yet existing schema '%s'" msgstr "" -#: ../gio/glib-compile-schemas.c:1161 +#: ../gio/glib-compile-schemas.c:1162 #, c-format msgid "Can not be a list of a schema with a path" msgstr "" -#: ../gio/glib-compile-schemas.c:1171 +#: ../gio/glib-compile-schemas.c:1172 #, c-format msgid "Can not extend a schema with a path" msgstr "" -#: ../gio/glib-compile-schemas.c:1181 +#: ../gio/glib-compile-schemas.c:1182 #, c-format msgid "" "<schema id='%s'> is a list, extending <schema id='%s'> which is not a list" msgstr "" -#: ../gio/glib-compile-schemas.c:1191 +#: ../gio/glib-compile-schemas.c:1192 #, c-format msgid "" "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' " "does not extend '%s'" msgstr "" -#: ../gio/glib-compile-schemas.c:1208 +#: ../gio/glib-compile-schemas.c:1209 #, c-format msgid "a path, if given, must begin and end with a slash" msgstr "" -#: ../gio/glib-compile-schemas.c:1215 +#: ../gio/glib-compile-schemas.c:1216 #, c-format msgid "the path of a list must end with ':/'" msgstr "" -#: ../gio/glib-compile-schemas.c:1247 +#: ../gio/glib-compile-schemas.c:1248 #, c-format msgid "<%s id='%s'> already specified" msgstr "" -#: ../gio/glib-compile-schemas.c:1397 ../gio/glib-compile-schemas.c:1413 +#: ../gio/glib-compile-schemas.c:1398 ../gio/glib-compile-schemas.c:1414 #, c-format msgid "Only one <%s> element allowed inside <%s>" msgstr "<%s> ішінде тек бір <%s> Ñлементіне Ñ€Ò±Ò›Ñат етілген" -#: ../gio/glib-compile-schemas.c:1495 +#: ../gio/glib-compile-schemas.c:1496 #, c-format msgid "Element <%s> not allowed at the top level" msgstr "" #. Translators: Do not translate "--strict". -#: ../gio/glib-compile-schemas.c:1794 ../gio/glib-compile-schemas.c:1865 -#: ../gio/glib-compile-schemas.c:1941 +#: ../gio/glib-compile-schemas.c:1806 ../gio/glib-compile-schemas.c:1880 +#: ../gio/glib-compile-schemas.c:1956 #, c-format msgid "--strict was specified; exiting.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1802 +#: ../gio/glib-compile-schemas.c:1816 #, c-format msgid "This entire file has been ignored.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1861 +#: ../gio/glib-compile-schemas.c:1876 #, c-format msgid "Ignoring this file.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1901 +#: ../gio/glib-compile-schemas.c:1916 #, c-format msgid "No such key '%s' in schema '%s' as specified in override file '%s'" msgstr "" -#: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965 -#: ../gio/glib-compile-schemas.c:1993 +#: ../gio/glib-compile-schemas.c:1922 ../gio/glib-compile-schemas.c:1980 +#: ../gio/glib-compile-schemas.c:2008 #, c-format msgid "; ignoring override for this key.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1911 ../gio/glib-compile-schemas.c:1969 -#: ../gio/glib-compile-schemas.c:1997 +#: ../gio/glib-compile-schemas.c:1926 ../gio/glib-compile-schemas.c:1984 +#: ../gio/glib-compile-schemas.c:2012 #, c-format msgid " and --strict was specified; exiting.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1927 +#: ../gio/glib-compile-schemas.c:1942 #, c-format msgid "" "error parsing key '%s' in schema '%s' as specified in override file '%s': %s." msgstr "" -#: ../gio/glib-compile-schemas.c:1937 +#: ../gio/glib-compile-schemas.c:1952 #, c-format msgid "Ignoring override for this key.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:1955 +#: ../gio/glib-compile-schemas.c:1970 #, c-format msgid "" "override for key '%s' in schema '%s' in override file '%s' is outside the " "range given in the schema" msgstr "" -#: ../gio/glib-compile-schemas.c:1983 +#: ../gio/glib-compile-schemas.c:1998 #, c-format msgid "" "override for key '%s' in schema '%s' in override file '%s' is not in the " "list of valid choices" msgstr "" -#: ../gio/glib-compile-schemas.c:2038 +#: ../gio/glib-compile-schemas.c:2054 msgid "where to store the gschemas.compiled file" msgstr "" -#: ../gio/glib-compile-schemas.c:2039 +#: ../gio/glib-compile-schemas.c:2055 msgid "Abort on any errors in schemas" msgstr "" -#: ../gio/glib-compile-schemas.c:2040 +#: ../gio/glib-compile-schemas.c:2056 msgid "Do not write the gschema.compiled file" msgstr "" -#: ../gio/glib-compile-schemas.c:2041 +#: ../gio/glib-compile-schemas.c:2057 msgid "Do not enforce key name restrictions" msgstr "" -#: ../gio/glib-compile-schemas.c:2070 +#: ../gio/glib-compile-schemas.c:2085 msgid "" "Compile all GSettings schema files into a schema cache.\n" "Schema files are required to have the extension .gschema.xml,\n" "and the cache file is called gschemas.compiled." msgstr "" -#: ../gio/glib-compile-schemas.c:2092 +#: ../gio/glib-compile-schemas.c:2106 #, c-format msgid "You should give exactly one directory name\n" msgstr "" -#: ../gio/glib-compile-schemas.c:2131 +#: ../gio/glib-compile-schemas.c:2148 #, c-format msgid "No schema files found: " msgstr "" -#: ../gio/glib-compile-schemas.c:2134 +#: ../gio/glib-compile-schemas.c:2151 #, c-format msgid "doing nothing.\n" msgstr "" -#: ../gio/glib-compile-schemas.c:2137 +#: ../gio/glib-compile-schemas.c:2154 #, c-format msgid "removed existing output file.\n" msgstr "" @@ -2502,6 +2498,10 @@ msgstr "Қате файл аты %s" msgid "Error getting filesystem info for %s: %s" msgstr "%s үшін файлдық жүйе ақпаратын алу қатеÑÑ–: %s" +#. Translators: This is an error message when trying to find +#. * the enclosing (user visible) mount of a file, but none +#. * exists. +#. #: ../gio/glocalfile.c:1176 #, c-format msgid "Containing mount for file %s not found" @@ -2590,7 +2590,7 @@ msgstr "" msgid "Error making symbolic link %s: %s" msgstr "%s Ñимволдық ÑілтемеÑін жаÑау қатеÑÑ–: %s" -#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2064 +#: ../gio/glocalfile.c:2292 ../glib/gfileutils.c:2077 msgid "Symbolic links not supported" msgstr "Символдық Ñілтемелерге қолдау жоқ" @@ -2603,9 +2603,9 @@ msgstr "%s файлын жылжыту қатеÑÑ–: %s" msgid "Can’t move directory over directory" msgstr "Буманы бума Ò¯Ñтіне жылжыту мүмкін емеÑ" -#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:925 -#: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954 -#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985 +#: ../gio/glocalfile.c:2396 ../gio/glocalfileoutputstream.c:931 +#: ../gio/glocalfileoutputstream.c:945 ../gio/glocalfileoutputstream.c:960 +#: ../gio/glocalfileoutputstream.c:977 ../gio/glocalfileoutputstream.c:991 msgid "Backup file creation failed" msgstr "" @@ -2644,7 +2644,7 @@ msgstr "\"%s\" кеңейтілген атрибутын орнату Ò›Ð°Ñ‚ÐµÑ msgid " (invalid encoding)" msgstr " (кодталуы қате)" -#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803 +#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:809 #, c-format msgid "Error when getting information for file “%sâ€: %s" msgstr "\"%s\" файлы ақпаратын алу қатеÑÑ–: %s" @@ -2724,7 +2724,7 @@ msgstr "Файлдан оқу қатеÑÑ–: %s" #: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211 #: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333 -#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003 +#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1009 #, c-format msgid "Error seeking in file: %s" msgstr "Файлдан іздеу қатеÑÑ–: %s" @@ -2760,30 +2760,30 @@ msgstr "" msgid "Error renaming temporary file: %s" msgstr "" -#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054 +#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1060 #, c-format msgid "Error truncating file: %s" msgstr "" -#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785 -#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360 +#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:791 +#: ../gio/glocalfileoutputstream.c:1041 ../gio/gsubprocess.c:360 #, c-format msgid "Error opening file “%sâ€: %s" msgstr "\"%s\" файлын ашу қатеÑÑ–: %s" -#: ../gio/glocalfileoutputstream.c:816 +#: ../gio/glocalfileoutputstream.c:822 msgid "Target file is a directory" msgstr "МақÑат файлы бума болып тұр" -#: ../gio/glocalfileoutputstream.c:821 +#: ../gio/glocalfileoutputstream.c:827 msgid "Target file is not a regular file" msgstr "МақÑат файлы қалыпты файл ÐµÐ¼ÐµÑ Ð±Ð¾Ð»Ñ‹Ð¿ тұр" -#: ../gio/glocalfileoutputstream.c:833 +#: ../gio/glocalfileoutputstream.c:839 msgid "The file was externally modified" msgstr "" -#: ../gio/glocalfileoutputstream.c:1019 +#: ../gio/glocalfileoutputstream.c:1025 #, c-format msgid "Error removing old file: %s" msgstr "ЕÑкі файлды өшіру қатеÑÑ–: %s" @@ -2898,7 +2898,7 @@ msgstr "" msgid "Could not get network status: " msgstr "" -#: ../gio/gnetworkmonitornm.c:326 +#: ../gio/gnetworkmonitornm.c:329 #, c-format msgid "NetworkManager version too old" msgstr "NetworkManager нұÑқаÑÑ‹ тым еÑкі" @@ -2911,29 +2911,27 @@ msgstr "" msgid "Source stream is already closed" msgstr "" -#: ../gio/gresolver.c:341 ../gio/gthreadedresolver.c:116 +#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116 #: ../gio/gthreadedresolver.c:126 #, c-format -#| msgid "Error removing file %s: %s" msgid "Error resolving “%sâ€: %s" msgstr "" -#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863 -#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132 -#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453 +#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874 +#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143 +#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453 #: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713 #, c-format msgid "The resource at “%s†does not exist" msgstr "" -#: ../gio/gresource.c:760 +#: ../gio/gresource.c:771 #, c-format msgid "The resource at “%s†failed to decompress" msgstr "" #: ../gio/gresourcefile.c:709 #, c-format -#| msgid "Target %s is not a directory" msgid "The resource at “%s†is not a directory" msgstr "" @@ -3241,144 +3239,144 @@ msgstr "" msgid "No such key “%sâ€\n" msgstr "" -#: ../gio/gsocket.c:364 +#: ../gio/gsocket.c:369 msgid "Invalid socket, not initialized" msgstr "" -#: ../gio/gsocket.c:371 +#: ../gio/gsocket.c:376 #, c-format msgid "Invalid socket, initialization failed due to: %s" msgstr "" -#: ../gio/gsocket.c:379 +#: ../gio/gsocket.c:384 msgid "Socket is already closed" msgstr "" -#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897 -#: ../gio/gsocket.c:3952 +#: ../gio/gsocket.c:399 ../gio/gsocket.c:2754 ../gio/gsocket.c:3939 +#: ../gio/gsocket.c:3995 msgid "Socket I/O timed out" msgstr "" -#: ../gio/gsocket.c:526 +#: ../gio/gsocket.c:531 #, c-format msgid "creating GSocket from fd: %s" msgstr "" -#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615 +#: ../gio/gsocket.c:559 ../gio/gsocket.c:613 ../gio/gsocket.c:620 #, c-format msgid "Unable to create socket: %s" msgstr "" -#: ../gio/gsocket.c:608 +#: ../gio/gsocket.c:613 msgid "Unknown family was specified" msgstr "" -#: ../gio/gsocket.c:615 +#: ../gio/gsocket.c:620 msgid "Unknown protocol was specified" msgstr "" -#: ../gio/gsocket.c:1104 +#: ../gio/gsocket.c:1111 #, c-format msgid "Cannot use datagram operations on a non-datagram socket." msgstr "" -#: ../gio/gsocket.c:1121 +#: ../gio/gsocket.c:1128 #, c-format msgid "Cannot use datagram operations on a socket with a timeout set." msgstr "" -#: ../gio/gsocket.c:1925 +#: ../gio/gsocket.c:1932 #, c-format msgid "could not get local address: %s" msgstr "" -#: ../gio/gsocket.c:1968 +#: ../gio/gsocket.c:1975 #, c-format msgid "could not get remote address: %s" msgstr "" -#: ../gio/gsocket.c:2034 +#: ../gio/gsocket.c:2041 #, c-format msgid "could not listen: %s" msgstr "" -#: ../gio/gsocket.c:2133 +#: ../gio/gsocket.c:2140 #, c-format msgid "Error binding to address: %s" msgstr "" -#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285 +#: ../gio/gsocket.c:2255 ../gio/gsocket.c:2292 #, c-format msgid "Error joining multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286 +#: ../gio/gsocket.c:2256 ../gio/gsocket.c:2293 #, c-format msgid "Error leaving multicast group: %s" msgstr "" -#: ../gio/gsocket.c:2250 +#: ../gio/gsocket.c:2257 msgid "No support for source-specific multicast" msgstr "" -#: ../gio/gsocket.c:2470 +#: ../gio/gsocket.c:2477 #, c-format msgid "Error accepting connection: %s" msgstr "" -#: ../gio/gsocket.c:2593 +#: ../gio/gsocket.c:2598 msgid "Connection in progress" msgstr "" -#: ../gio/gsocket.c:2644 +#: ../gio/gsocket.c:2647 msgid "Unable to get pending error: " msgstr "" -#: ../gio/gsocket.c:2816 +#: ../gio/gsocket.c:2817 #, c-format msgid "Error receiving data: %s" msgstr "" -#: ../gio/gsocket.c:3013 +#: ../gio/gsocket.c:3012 #, c-format msgid "Error sending data: %s" msgstr "" -#: ../gio/gsocket.c:3200 +#: ../gio/gsocket.c:3199 #, c-format msgid "Unable to shutdown socket: %s" msgstr "" -#: ../gio/gsocket.c:3281 +#: ../gio/gsocket.c:3280 #, c-format msgid "Error closing socket: %s" msgstr "" -#: ../gio/gsocket.c:3890 +#: ../gio/gsocket.c:3932 #, c-format msgid "Waiting for socket condition: %s" msgstr "" -#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619 +#: ../gio/gsocket.c:4404 ../gio/gsocket.c:4484 ../gio/gsocket.c:4662 #, c-format msgid "Error sending message: %s" msgstr "Хабарламаны жіберу ÑәтÑіз: %s" -#: ../gio/gsocket.c:4385 +#: ../gio/gsocket.c:4428 msgid "GSocketControlMessage not supported on Windows" msgstr "" -#: ../gio/gsocket.c:4838 ../gio/gsocket.c:4911 ../gio/gsocket.c:5138 +#: ../gio/gsocket.c:4881 ../gio/gsocket.c:4954 ../gio/gsocket.c:5180 #, c-format msgid "Error receiving message: %s" msgstr "" -#: ../gio/gsocket.c:5410 +#: ../gio/gsocket.c:5452 #, c-format msgid "Unable to read socket credentials: %s" msgstr "" -#: ../gio/gsocket.c:5419 +#: ../gio/gsocket.c:5461 msgid "g_socket_get_credentials not implemented for this OS" msgstr "" @@ -3514,7 +3512,6 @@ msgstr "" #: ../gio/gthreadedresolver.c:213 #, c-format -#| msgid "Error removing file %s: %s" msgid "Error reverse-resolving “%sâ€: %s" msgstr "" @@ -3531,7 +3528,6 @@ msgstr "" #: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738 #, c-format -#| msgid "Error removing file %s: %s" msgid "Error resolving “%sâ€" msgstr "" @@ -3560,17 +3556,19 @@ msgid "" "This is the last chance to enter the password correctly before your access " "is locked out." msgstr "" -"Қатынау Ñ€Ò±Ò›Ñаты блокталуға дейінгі парольді енгізудің Ñоңғы мүмкіндігі қалды" +"Қатынау Ñ€Ò±Ò›Ñаты блокталуға дейінгі парольді енгізудің Ñоңғы мүмкіндігі қалды." -#: ../gio/gtlspassword.c:113 +#. Translators: This is not the 'This is the last chance' string. It is +#. * displayed when more than one attempt is allowed. +#: ../gio/gtlspassword.c:115 msgid "" -"Several password entered have been incorrect, and your access will be locked " -"out after further failures." +"Several passwords entered have been incorrect, and your access will be " +"locked out after further failures." msgstr "" "Парольді енгізудің бірнеше талабы ÑәтÑіз болды, қатынау Ñ€Ò±Ò›Ñаты келеÑÑ– " "ÑәтÑіз енгізулерде блокталатын болады." -#: ../gio/gtlspassword.c:115 +#: ../gio/gtlspassword.c:117 msgid "The password entered is incorrect." msgstr "" @@ -3634,7 +3632,7 @@ msgstr "" msgid "Error closing file descriptor: %s" msgstr "" -#: ../gio/gunixmounts.c:2364 ../gio/gunixmounts.c:2417 +#: ../gio/gunixmounts.c:2422 ../gio/gunixmounts.c:2475 msgid "Filesystem root" msgstr "Файлдық жүйе түбірі" @@ -3643,7 +3641,7 @@ msgstr "Файлдық жүйе түбірі" msgid "Error writing to file descriptor: %s" msgstr "" -#: ../gio/gunixsocketaddress.c:239 +#: ../gio/gunixsocketaddress.c:241 msgid "Abstract UNIX domain socket addresses not supported on this system" msgstr "" @@ -3715,78 +3713,78 @@ msgstr "" msgid "Wrong args\n" msgstr "" -#: ../glib/gbookmarkfile.c:755 +#: ../glib/gbookmarkfile.c:754 #, c-format msgid "Unexpected attribute “%s†for element “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837 -#: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954 +#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836 +#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953 #, c-format msgid "Attribute “%s†of element “%s†not found" msgstr "" -#: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189 -#: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263 +#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188 +#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262 #, c-format msgid "Unexpected tag “%sâ€, tag “%s†expected" msgstr "" -#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163 -#: ../glib/gbookmarkfile.c:1231 +#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162 +#: ../glib/gbookmarkfile.c:1230 #, c-format msgid "Unexpected tag “%s†inside “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:1757 +#: ../glib/gbookmarkfile.c:1756 msgid "No valid bookmark file found in data dirs" msgstr "" -#: ../glib/gbookmarkfile.c:1958 +#: ../glib/gbookmarkfile.c:1957 #, c-format msgid "A bookmark for URI “%s†already exists" msgstr "" -#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162 -#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327 -#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495 -#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652 -#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791 -#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101 -#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345 -#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523 -#: ../glib/gbookmarkfile.c:3639 +#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161 +#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326 +#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494 +#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651 +#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790 +#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100 +#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344 +#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522 +#: ../glib/gbookmarkfile.c:3638 #, c-format msgid "No bookmark found for URI “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:2336 +#: ../glib/gbookmarkfile.c:2335 #, c-format msgid "No MIME type defined in the bookmark for URI “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:2421 +#: ../glib/gbookmarkfile.c:2420 #, c-format msgid "No private flag has been defined in bookmark for URI “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:2800 +#: ../glib/gbookmarkfile.c:2799 #, c-format msgid "No groups set in bookmark for URI “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355 +#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354 #, c-format msgid "No application with name “%s†registered a bookmark for “%sâ€" msgstr "" -#: ../glib/gbookmarkfile.c:3378 +#: ../glib/gbookmarkfile.c:3377 #, c-format msgid "Failed to expand exec line “%s†with URI “%sâ€" msgstr "" -#: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063 -#: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304 +#: ../glib/gconvert.c:477 ../glib/gutf8.c:852 ../glib/gutf8.c:1064 +#: ../glib/gutf8.c:1201 ../glib/gutf8.c:1305 msgid "Partial character sequence at end of input" msgstr "" @@ -3795,347 +3793,339 @@ msgstr "" msgid "Cannot convert fallback “%s†to codeset “%sâ€" msgstr "" -#: ../glib/gconvert.c:1567 +#: ../glib/gconvert.c:1513 #, c-format msgid "The URI “%s†is not an absolute URI using the “file†scheme" msgstr "" -#: ../glib/gconvert.c:1577 +#: ../glib/gconvert.c:1523 #, c-format msgid "The local file URI “%s†may not include a “#â€" msgstr "" -#: ../glib/gconvert.c:1594 +#: ../glib/gconvert.c:1540 #, c-format msgid "The URI “%s†is invalid" msgstr "URI \"%s\" қате" -#: ../glib/gconvert.c:1606 +#: ../glib/gconvert.c:1552 #, c-format -#| msgid "The URI '%s' is invalid" msgid "The hostname of the URI “%s†is invalid" msgstr "" -#: ../glib/gconvert.c:1622 +#: ../glib/gconvert.c:1568 #, c-format msgid "The URI “%s†contains invalidly escaped characters" msgstr "" -#: ../glib/gconvert.c:1717 +#: ../glib/gconvert.c:1640 #, c-format msgid "The pathname “%s†is not an absolute path" msgstr "" -#: ../glib/gconvert.c:1727 -msgid "Invalid hostname" -msgstr "ХоÑÑ‚ аты қате" - -#. Translators: 'before midday' indicator -#: ../glib/gdatetime.c:201 -msgctxt "GDateTime" -msgid "AM" -msgstr "AM" - -#. Translators: 'after midday' indicator -#: ../glib/gdatetime.c:203 -msgctxt "GDateTime" -msgid "PM" -msgstr "PM" - #. Translators: this is the preferred format for expressing the date and the time -#: ../glib/gdatetime.c:206 +#: ../glib/gdatetime.c:202 msgctxt "GDateTime" msgid "%a %b %e %H:%M:%S %Y" msgstr "%a %d %b %Y %T" #. Translators: this is the preferred format for expressing the date -#: ../glib/gdatetime.c:209 +#: ../glib/gdatetime.c:205 msgctxt "GDateTime" msgid "%m/%d/%y" msgstr "%d.%m.%Y" #. Translators: this is the preferred format for expressing the time -#: ../glib/gdatetime.c:212 +#: ../glib/gdatetime.c:208 msgctxt "GDateTime" msgid "%H:%M:%S" msgstr "%T" #. Translators: this is the preferred format for expressing 12 hour time -#: ../glib/gdatetime.c:215 +#: ../glib/gdatetime.c:211 msgctxt "GDateTime" msgid "%I:%M:%S %p" msgstr "%I:%M:%S %p" -#: ../glib/gdatetime.c:228 +#: ../glib/gdatetime.c:224 msgctxt "full month name" msgid "January" msgstr "Қаңтар" -#: ../glib/gdatetime.c:230 +#: ../glib/gdatetime.c:226 msgctxt "full month name" msgid "February" msgstr "Ðқпан" -#: ../glib/gdatetime.c:232 +#: ../glib/gdatetime.c:228 msgctxt "full month name" msgid "March" msgstr "Ðаурыз" -#: ../glib/gdatetime.c:234 +#: ../glib/gdatetime.c:230 msgctxt "full month name" msgid "April" msgstr "Сәуір" -#: ../glib/gdatetime.c:236 +#: ../glib/gdatetime.c:232 msgctxt "full month name" msgid "May" msgstr "Мамыр" -#: ../glib/gdatetime.c:238 +#: ../glib/gdatetime.c:234 msgctxt "full month name" msgid "June" msgstr "МауÑым" -#: ../glib/gdatetime.c:240 +#: ../glib/gdatetime.c:236 msgctxt "full month name" msgid "July" msgstr "Шілде" -#: ../glib/gdatetime.c:242 +#: ../glib/gdatetime.c:238 msgctxt "full month name" msgid "August" msgstr "Тамыз" -#: ../glib/gdatetime.c:244 +#: ../glib/gdatetime.c:240 msgctxt "full month name" msgid "September" msgstr "Қыркүйек" -#: ../glib/gdatetime.c:246 +#: ../glib/gdatetime.c:242 msgctxt "full month name" msgid "October" msgstr "Қазан" -#: ../glib/gdatetime.c:248 +#: ../glib/gdatetime.c:244 msgctxt "full month name" msgid "November" msgstr "Қараша" -#: ../glib/gdatetime.c:250 +#: ../glib/gdatetime.c:246 msgctxt "full month name" msgid "December" msgstr "ЖелтоқÑан" -#: ../glib/gdatetime.c:265 +#: ../glib/gdatetime.c:261 msgctxt "abbreviated month name" msgid "Jan" msgstr "Қаң" -#: ../glib/gdatetime.c:267 +#: ../glib/gdatetime.c:263 msgctxt "abbreviated month name" msgid "Feb" msgstr "Ðқп" -#: ../glib/gdatetime.c:269 +#: ../glib/gdatetime.c:265 msgctxt "abbreviated month name" msgid "Mar" msgstr "Ðау" -#: ../glib/gdatetime.c:271 +#: ../glib/gdatetime.c:267 msgctxt "abbreviated month name" msgid "Apr" msgstr "Сәу" -#: ../glib/gdatetime.c:273 +#: ../glib/gdatetime.c:269 msgctxt "abbreviated month name" msgid "May" msgstr "Мам" -#: ../glib/gdatetime.c:275 +#: ../glib/gdatetime.c:271 msgctxt "abbreviated month name" msgid "Jun" msgstr "Мау" -#: ../glib/gdatetime.c:277 +#: ../glib/gdatetime.c:273 msgctxt "abbreviated month name" msgid "Jul" msgstr "Шіл" -#: ../glib/gdatetime.c:279 +#: ../glib/gdatetime.c:275 msgctxt "abbreviated month name" msgid "Aug" msgstr "Там" -#: ../glib/gdatetime.c:281 +#: ../glib/gdatetime.c:277 msgctxt "abbreviated month name" msgid "Sep" msgstr "Қыр" -#: ../glib/gdatetime.c:283 +#: ../glib/gdatetime.c:279 msgctxt "abbreviated month name" msgid "Oct" msgstr "Қаз" -#: ../glib/gdatetime.c:285 +#: ../glib/gdatetime.c:281 msgctxt "abbreviated month name" msgid "Nov" msgstr "Қар" -#: ../glib/gdatetime.c:287 +#: ../glib/gdatetime.c:283 msgctxt "abbreviated month name" msgid "Dec" msgstr "Жел" -#: ../glib/gdatetime.c:302 +#: ../glib/gdatetime.c:298 msgctxt "full weekday name" msgid "Monday" msgstr "ДүйÑенбі" -#: ../glib/gdatetime.c:304 +#: ../glib/gdatetime.c:300 msgctxt "full weekday name" msgid "Tuesday" msgstr "СейÑенбі" -#: ../glib/gdatetime.c:306 +#: ../glib/gdatetime.c:302 msgctxt "full weekday name" msgid "Wednesday" msgstr "СәрÑенбі" -#: ../glib/gdatetime.c:308 +#: ../glib/gdatetime.c:304 msgctxt "full weekday name" msgid "Thursday" msgstr "БейÑенбі" -#: ../glib/gdatetime.c:310 +#: ../glib/gdatetime.c:306 msgctxt "full weekday name" msgid "Friday" msgstr "Жұма" -#: ../glib/gdatetime.c:312 +#: ../glib/gdatetime.c:308 msgctxt "full weekday name" msgid "Saturday" msgstr "Сенбі" -#: ../glib/gdatetime.c:314 +#: ../glib/gdatetime.c:310 msgctxt "full weekday name" msgid "Sunday" msgstr "ЖекÑенбі" -#: ../glib/gdatetime.c:329 +#: ../glib/gdatetime.c:325 msgctxt "abbreviated weekday name" msgid "Mon" msgstr "ДÑ" -#: ../glib/gdatetime.c:331 +#: ../glib/gdatetime.c:327 msgctxt "abbreviated weekday name" msgid "Tue" msgstr "СÑ" -#: ../glib/gdatetime.c:333 +#: ../glib/gdatetime.c:329 msgctxt "abbreviated weekday name" msgid "Wed" msgstr "Ср" -#: ../glib/gdatetime.c:335 +#: ../glib/gdatetime.c:331 msgctxt "abbreviated weekday name" msgid "Thu" msgstr "БÑ" -#: ../glib/gdatetime.c:337 +#: ../glib/gdatetime.c:333 msgctxt "abbreviated weekday name" msgid "Fri" msgstr "Жм" -#: ../glib/gdatetime.c:339 +#: ../glib/gdatetime.c:335 msgctxt "abbreviated weekday name" msgid "Sat" msgstr "Сн" -#: ../glib/gdatetime.c:341 +#: ../glib/gdatetime.c:337 msgctxt "abbreviated weekday name" msgid "Sun" msgstr "Жк" +#. Translators: 'before midday' indicator +#: ../glib/gdatetime.c:354 +msgctxt "GDateTime" +msgid "AM" +msgstr "AM" + +#. Translators: 'after midday' indicator +#: ../glib/gdatetime.c:357 +msgctxt "GDateTime" +msgid "PM" +msgstr "PM" + #: ../glib/gdir.c:155 #, c-format msgid "Error opening directory “%sâ€: %s" msgstr "\"%s\" бумаÑын ашу қатеÑÑ–: %s" -#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793 +#: ../glib/gfileutils.c:706 ../glib/gfileutils.c:798 #, c-format msgid "Could not allocate %lu byte to read file “%sâ€" msgid_plural "Could not allocate %lu bytes to read file “%sâ€" msgstr[0] "" -#: ../glib/gfileutils.c:718 +#: ../glib/gfileutils.c:723 #, c-format msgid "Error reading file “%sâ€: %s" msgstr "\"%s\" файлын оқу қатеÑÑ–: %s" -#: ../glib/gfileutils.c:754 +#: ../glib/gfileutils.c:759 #, c-format msgid "File “%s†is too large" msgstr "\"%s\" файлы тым үлкен" -#: ../glib/gfileutils.c:818 +#: ../glib/gfileutils.c:823 #, c-format msgid "Failed to read from file “%sâ€: %s" msgstr "\"%s\" файлынан оқу қатеÑÑ–: %s" -#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938 +#: ../glib/gfileutils.c:871 ../glib/gfileutils.c:943 #, c-format msgid "Failed to open file “%sâ€: %s" msgstr "\"%s\" файлын ашу қатеÑÑ–: %s" -#: ../glib/gfileutils.c:878 +#: ../glib/gfileutils.c:883 #, c-format -#| msgid "Failed to open file '%s': open() failed: %s" msgid "Failed to get attributes of file “%sâ€: fstat() failed: %s" msgstr "" -#: ../glib/gfileutils.c:908 +#: ../glib/gfileutils.c:913 #, c-format -#| msgid "Failed to open file '%s': open() failed: %s" msgid "Failed to open file “%sâ€: fdopen() failed: %s" msgstr "" -#: ../glib/gfileutils.c:1007 +#: ../glib/gfileutils.c:1012 #, c-format -#| msgid "Failed to open file '%s': open() failed: %s" msgid "Failed to rename file “%s†to “%sâ€: g_rename() failed: %s" msgstr "" -#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541 +#: ../glib/gfileutils.c:1047 ../glib/gfileutils.c:1554 #, c-format msgid "Failed to create file “%sâ€: %s" msgstr "\"%s\" файлын жаÑау ÑәтÑіз: %s" -#: ../glib/gfileutils.c:1069 +#: ../glib/gfileutils.c:1074 #, c-format msgid "Failed to write file “%sâ€: write() failed: %s" msgstr "\"%s\" файлын жазу ÑәтÑіз: write() ÑәтÑіз аÑқталды: %s" -#: ../glib/gfileutils.c:1112 +#: ../glib/gfileutils.c:1117 #, c-format msgid "Failed to write file “%sâ€: fsync() failed: %s" msgstr "\"%s\" файлын жазу ÑәтÑіз: fsync() ÑәтÑіз аÑқталды: %s" -#: ../glib/gfileutils.c:1236 +#: ../glib/gfileutils.c:1241 #, c-format msgid "Existing file “%s†could not be removed: g_unlink() failed: %s" msgstr "" -#: ../glib/gfileutils.c:1507 +#: ../glib/gfileutils.c:1520 #, c-format msgid "Template “%s†invalid, should not contain a “%sâ€" msgstr "" -#: ../glib/gfileutils.c:1520 +#: ../glib/gfileutils.c:1533 #, c-format msgid "Template “%s†doesn’t contain XXXXXX" msgstr "" -#: ../glib/gfileutils.c:2045 +#: ../glib/gfileutils.c:2058 #, c-format msgid "Failed to read the symbolic link “%sâ€: %s" msgstr "" @@ -4162,99 +4152,99 @@ msgstr "" msgid "Can’t do a raw read in g_io_channel_read_to_end" msgstr "" -#: ../glib/gkeyfile.c:737 +#: ../glib/gkeyfile.c:736 msgid "Valid key file could not be found in search dirs" msgstr "" -#: ../glib/gkeyfile.c:773 +#: ../glib/gkeyfile.c:772 msgid "Not a regular file" msgstr "Қалыпты файл емеÑ" -#: ../glib/gkeyfile.c:1204 +#: ../glib/gkeyfile.c:1212 #, c-format msgid "" "Key file contains line “%s†which is not a key-value pair, group, or comment" msgstr "" -#: ../glib/gkeyfile.c:1261 +#: ../glib/gkeyfile.c:1269 #, c-format msgid "Invalid group name: %s" msgstr "Қате топ аты: %s" -#: ../glib/gkeyfile.c:1283 +#: ../glib/gkeyfile.c:1291 msgid "Key file does not start with a group" msgstr "" -#: ../glib/gkeyfile.c:1309 +#: ../glib/gkeyfile.c:1317 #, c-format msgid "Invalid key name: %s" msgstr "" -#: ../glib/gkeyfile.c:1336 +#: ../glib/gkeyfile.c:1344 #, c-format msgid "Key file contains unsupported encoding “%sâ€" msgstr "" -#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130 -#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453 -#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893 +#: ../glib/gkeyfile.c:1587 ../glib/gkeyfile.c:1760 ../glib/gkeyfile.c:3140 +#: ../glib/gkeyfile.c:3203 ../glib/gkeyfile.c:3333 ../glib/gkeyfile.c:3463 +#: ../glib/gkeyfile.c:3607 ../glib/gkeyfile.c:3836 ../glib/gkeyfile.c:3903 #, c-format msgid "Key file does not have group “%sâ€" msgstr "" -#: ../glib/gkeyfile.c:1707 +#: ../glib/gkeyfile.c:1715 #, c-format msgid "Key file does not have key “%s†in group “%sâ€" msgstr "" -#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985 +#: ../glib/gkeyfile.c:1877 ../glib/gkeyfile.c:1993 #, c-format msgid "Key file contains key “%s†with value “%s†which is not UTF-8" msgstr "" -#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374 +#: ../glib/gkeyfile.c:1897 ../glib/gkeyfile.c:2013 ../glib/gkeyfile.c:2382 #, c-format msgid "" "Key file contains key “%s†which has a value that cannot be interpreted." msgstr "" -#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959 +#: ../glib/gkeyfile.c:2600 ../glib/gkeyfile.c:2969 #, c-format msgid "" "Key file contains key “%s†in group “%s†which has a value that cannot be " "interpreted." msgstr "" -#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746 +#: ../glib/gkeyfile.c:2678 ../glib/gkeyfile.c:2755 #, c-format msgid "Key “%s†in group “%s†has value “%s†where %s was expected" msgstr "" -#: ../glib/gkeyfile.c:4133 +#: ../glib/gkeyfile.c:4143 msgid "Key file contains escape character at end of line" msgstr "" -#: ../glib/gkeyfile.c:4155 +#: ../glib/gkeyfile.c:4165 #, c-format msgid "Key file contains invalid escape sequence “%sâ€" msgstr "" -#: ../glib/gkeyfile.c:4297 +#: ../glib/gkeyfile.c:4307 #, c-format msgid "Value “%s†cannot be interpreted as a number." msgstr "" -#: ../glib/gkeyfile.c:4311 +#: ../glib/gkeyfile.c:4321 #, c-format msgid "Integer value “%s†out of range" msgstr "" -#: ../glib/gkeyfile.c:4344 +#: ../glib/gkeyfile.c:4354 #, c-format msgid "Value “%s†cannot be interpreted as a float number." msgstr "" -#: ../glib/gkeyfile.c:4383 +#: ../glib/gkeyfile.c:4393 #, c-format msgid "Value “%s†cannot be interpreted as a boolean." msgstr "" @@ -4274,91 +4264,91 @@ msgstr "" msgid "Failed to open file “%sâ€: open() failed: %s" msgstr "\"%s\" файлын ашу ÑәтÑіз: open() аÑқталды: %s" -#: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440 +#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439 #, c-format msgid "Error on line %d char %d: " msgstr "" -#: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545 +#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544 #, c-format msgid "Invalid UTF-8 encoded text in name - not valid '%s'" msgstr "" -#: ../glib/gmarkup.c:473 +#: ../glib/gmarkup.c:472 #, c-format msgid "'%s' is not a valid name" msgstr "'%s' Ð´Ò±Ñ€Ñ‹Ñ Ð°Ñ‚Ð°Ñƒ емеÑ" -#: ../glib/gmarkup.c:489 +#: ../glib/gmarkup.c:488 #, c-format msgid "'%s' is not a valid name: '%c'" msgstr "'%s' Ð´Ò±Ñ€Ñ‹Ñ Ð°Ñ‚Ð°Ñƒ емеÑ: '%c'" -#: ../glib/gmarkup.c:599 +#: ../glib/gmarkup.c:598 #, c-format msgid "Error on line %d: %s" msgstr "" -#: ../glib/gmarkup.c:676 +#: ../glib/gmarkup.c:675 #, c-format msgid "" "Failed to parse '%-.*s', which should have been a digit inside a character " "reference (ê for example) - perhaps the digit is too large" msgstr "" -#: ../glib/gmarkup.c:688 +#: ../glib/gmarkup.c:687 msgid "" "Character reference did not end with a semicolon; most likely you used an " "ampersand character without intending to start an entity - escape ampersand " "as &" msgstr "" -#: ../glib/gmarkup.c:714 +#: ../glib/gmarkup.c:713 #, c-format msgid "Character reference '%-.*s' does not encode a permitted character" msgstr "" -#: ../glib/gmarkup.c:752 +#: ../glib/gmarkup.c:751 msgid "" "Empty entity '&;' seen; valid entities are: & " < > '" msgstr "" -#: ../glib/gmarkup.c:760 +#: ../glib/gmarkup.c:759 #, c-format msgid "Entity name '%-.*s' is not known" msgstr "" -#: ../glib/gmarkup.c:765 +#: ../glib/gmarkup.c:764 msgid "" "Entity did not end with a semicolon; most likely you used an ampersand " "character without intending to start an entity - escape ampersand as &" msgstr "" -#: ../glib/gmarkup.c:1171 +#: ../glib/gmarkup.c:1170 msgid "Document must begin with an element (e.g. <book>)" msgstr "" -#: ../glib/gmarkup.c:1211 +#: ../glib/gmarkup.c:1210 #, c-format msgid "" "'%s' is not a valid character following a '<' character; it may not begin an " "element name" msgstr "" -#: ../glib/gmarkup.c:1253 +#: ../glib/gmarkup.c:1252 #, c-format msgid "" "Odd character '%s', expected a '>' character to end the empty-element tag " "'%s'" msgstr "" -#: ../glib/gmarkup.c:1334 +#: ../glib/gmarkup.c:1333 #, c-format msgid "" "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'" msgstr "" -#: ../glib/gmarkup.c:1375 +#: ../glib/gmarkup.c:1374 #, c-format msgid "" "Odd character '%s', expected a '>' or '/' character to end the start tag of " @@ -4366,87 +4356,87 @@ msgid "" "character in an attribute name" msgstr "" -#: ../glib/gmarkup.c:1419 +#: ../glib/gmarkup.c:1418 #, c-format msgid "" "Odd character '%s', expected an open quote mark after the equals sign when " "giving value for attribute '%s' of element '%s'" msgstr "" -#: ../glib/gmarkup.c:1552 +#: ../glib/gmarkup.c:1551 #, c-format msgid "" "'%s' is not a valid character following the characters '</'; '%s' may not " "begin an element name" msgstr "" -#: ../glib/gmarkup.c:1588 +#: ../glib/gmarkup.c:1587 #, c-format msgid "" "'%s' is not a valid character following the close element name '%s'; the " "allowed character is '>'" msgstr "" -#: ../glib/gmarkup.c:1599 +#: ../glib/gmarkup.c:1598 #, c-format msgid "Element '%s' was closed, no element is currently open" msgstr "" -#: ../glib/gmarkup.c:1608 +#: ../glib/gmarkup.c:1607 #, c-format msgid "Element '%s' was closed, but the currently open element is '%s'" msgstr "" -#: ../glib/gmarkup.c:1761 +#: ../glib/gmarkup.c:1760 msgid "Document was empty or contained only whitespace" msgstr "" -#: ../glib/gmarkup.c:1775 +#: ../glib/gmarkup.c:1774 msgid "Document ended unexpectedly just after an open angle bracket '<'" msgstr "" -#: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828 +#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827 #, c-format msgid "" "Document ended unexpectedly with elements still open - '%s' was the last " "element opened" msgstr "" -#: ../glib/gmarkup.c:1791 +#: ../glib/gmarkup.c:1790 #, c-format msgid "" "Document ended unexpectedly, expected to see a close angle bracket ending " "the tag <%s/>" msgstr "" -#: ../glib/gmarkup.c:1797 +#: ../glib/gmarkup.c:1796 msgid "Document ended unexpectedly inside an element name" msgstr "" -#: ../glib/gmarkup.c:1803 +#: ../glib/gmarkup.c:1802 msgid "Document ended unexpectedly inside an attribute name" msgstr "" -#: ../glib/gmarkup.c:1808 +#: ../glib/gmarkup.c:1807 msgid "Document ended unexpectedly inside an element-opening tag." msgstr "" -#: ../glib/gmarkup.c:1814 +#: ../glib/gmarkup.c:1813 msgid "" "Document ended unexpectedly after the equals sign following an attribute " "name; no attribute value" msgstr "" -#: ../glib/gmarkup.c:1821 +#: ../glib/gmarkup.c:1820 msgid "Document ended unexpectedly while inside an attribute value" msgstr "" -#: ../glib/gmarkup.c:1837 +#: ../glib/gmarkup.c:1836 #, c-format msgid "Document ended unexpectedly inside the close tag for element '%s'" msgstr "" -#: ../glib/gmarkup.c:1843 +#: ../glib/gmarkup.c:1842 msgid "Document ended unexpectedly inside a comment or processing instruction" msgstr "" @@ -4509,326 +4499,326 @@ msgstr "" msgid "Unknown option %s" msgstr "БелгіÑіз Ð¾Ð¿Ñ†Ð¸Ñ %s" -#: ../glib/gregex.c:258 +#: ../glib/gregex.c:257 msgid "corrupted object" msgstr "" -#: ../glib/gregex.c:260 +#: ../glib/gregex.c:259 msgid "internal error or corrupted object" msgstr "" -#: ../glib/gregex.c:262 +#: ../glib/gregex.c:261 msgid "out of memory" msgstr "жады жеткілікÑіз" -#: ../glib/gregex.c:267 +#: ../glib/gregex.c:266 msgid "backtracking limit reached" msgstr "" -#: ../glib/gregex.c:279 ../glib/gregex.c:287 +#: ../glib/gregex.c:278 ../glib/gregex.c:286 msgid "the pattern contains items not supported for partial matching" msgstr "" -#: ../glib/gregex.c:281 +#: ../glib/gregex.c:280 msgid "internal error" msgstr "ішкі қате" -#: ../glib/gregex.c:289 +#: ../glib/gregex.c:288 msgid "back references as conditions are not supported for partial matching" msgstr "" -#: ../glib/gregex.c:298 +#: ../glib/gregex.c:297 msgid "recursion limit reached" msgstr "" -#: ../glib/gregex.c:300 +#: ../glib/gregex.c:299 msgid "invalid combination of newline flags" msgstr "" -#: ../glib/gregex.c:302 +#: ../glib/gregex.c:301 msgid "bad offset" msgstr "қате шегініÑ" -#: ../glib/gregex.c:304 +#: ../glib/gregex.c:303 msgid "short utf8" msgstr "қыÑқа utf8" -#: ../glib/gregex.c:306 +#: ../glib/gregex.c:305 msgid "recursion loop" msgstr "" -#: ../glib/gregex.c:310 +#: ../glib/gregex.c:309 msgid "unknown error" msgstr "белгіÑіз қате" -#: ../glib/gregex.c:330 +#: ../glib/gregex.c:329 msgid "\\ at end of pattern" msgstr "" -#: ../glib/gregex.c:333 +#: ../glib/gregex.c:332 msgid "\\c at end of pattern" msgstr "" -#: ../glib/gregex.c:336 +#: ../glib/gregex.c:335 msgid "unrecognized character following \\" msgstr "" -#: ../glib/gregex.c:339 +#: ../glib/gregex.c:338 msgid "numbers out of order in {} quantifier" msgstr "" -#: ../glib/gregex.c:342 +#: ../glib/gregex.c:341 msgid "number too big in {} quantifier" msgstr "" -#: ../glib/gregex.c:345 +#: ../glib/gregex.c:344 msgid "missing terminating ] for character class" msgstr "" -#: ../glib/gregex.c:348 +#: ../glib/gregex.c:347 msgid "invalid escape sequence in character class" msgstr "" -#: ../glib/gregex.c:351 +#: ../glib/gregex.c:350 msgid "range out of order in character class" msgstr "" -#: ../glib/gregex.c:354 +#: ../glib/gregex.c:353 msgid "nothing to repeat" msgstr "" -#: ../glib/gregex.c:358 +#: ../glib/gregex.c:357 msgid "unexpected repeat" msgstr "" -#: ../glib/gregex.c:361 +#: ../glib/gregex.c:360 msgid "unrecognized character after (? or (?-" msgstr "" -#: ../glib/gregex.c:364 +#: ../glib/gregex.c:363 msgid "POSIX named classes are supported only within a class" msgstr "" -#: ../glib/gregex.c:367 +#: ../glib/gregex.c:366 msgid "missing terminating )" msgstr "" -#: ../glib/gregex.c:370 +#: ../glib/gregex.c:369 msgid "reference to non-existent subpattern" msgstr "" -#: ../glib/gregex.c:373 +#: ../glib/gregex.c:372 msgid "missing ) after comment" msgstr "" -#: ../glib/gregex.c:376 +#: ../glib/gregex.c:375 msgid "regular expression is too large" msgstr "" -#: ../glib/gregex.c:379 +#: ../glib/gregex.c:378 msgid "failed to get memory" msgstr "" -#: ../glib/gregex.c:383 +#: ../glib/gregex.c:382 msgid ") without opening (" msgstr "" -#: ../glib/gregex.c:387 +#: ../glib/gregex.c:386 msgid "code overflow" msgstr "" -#: ../glib/gregex.c:391 +#: ../glib/gregex.c:390 msgid "unrecognized character after (?<" msgstr "" -#: ../glib/gregex.c:394 +#: ../glib/gregex.c:393 msgid "lookbehind assertion is not fixed length" msgstr "" -#: ../glib/gregex.c:397 +#: ../glib/gregex.c:396 msgid "malformed number or name after (?(" msgstr "" -#: ../glib/gregex.c:400 +#: ../glib/gregex.c:399 msgid "conditional group contains more than two branches" msgstr "" -#: ../glib/gregex.c:403 +#: ../glib/gregex.c:402 msgid "assertion expected after (?(" msgstr "" #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of) #. * sequences here, '(?-54' would be an example for the second group. #. -#: ../glib/gregex.c:410 +#: ../glib/gregex.c:409 msgid "(?R or (?[+-]digits must be followed by )" msgstr "" -#: ../glib/gregex.c:413 +#: ../glib/gregex.c:412 msgid "unknown POSIX class name" msgstr "" -#: ../glib/gregex.c:416 +#: ../glib/gregex.c:415 msgid "POSIX collating elements are not supported" msgstr "" -#: ../glib/gregex.c:419 +#: ../glib/gregex.c:418 msgid "character value in \\x{...} sequence is too large" msgstr "" -#: ../glib/gregex.c:422 +#: ../glib/gregex.c:421 msgid "invalid condition (?(0)" msgstr "" -#: ../glib/gregex.c:425 +#: ../glib/gregex.c:424 msgid "\\C not allowed in lookbehind assertion" msgstr "" -#: ../glib/gregex.c:432 +#: ../glib/gregex.c:431 msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported" msgstr "" -#: ../glib/gregex.c:435 +#: ../glib/gregex.c:434 msgid "recursive call could loop indefinitely" msgstr "" -#: ../glib/gregex.c:439 +#: ../glib/gregex.c:438 msgid "unrecognized character after (?P" msgstr "" -#: ../glib/gregex.c:442 +#: ../glib/gregex.c:441 msgid "missing terminator in subpattern name" msgstr "" -#: ../glib/gregex.c:445 +#: ../glib/gregex.c:444 msgid "two named subpatterns have the same name" msgstr "" -#: ../glib/gregex.c:448 +#: ../glib/gregex.c:447 msgid "malformed \\P or \\p sequence" msgstr "" -#: ../glib/gregex.c:451 +#: ../glib/gregex.c:450 msgid "unknown property name after \\P or \\p" msgstr "" -#: ../glib/gregex.c:454 +#: ../glib/gregex.c:453 msgid "subpattern name is too long (maximum 32 characters)" msgstr "" -#: ../glib/gregex.c:457 +#: ../glib/gregex.c:456 msgid "too many named subpatterns (maximum 10,000)" msgstr "" -#: ../glib/gregex.c:460 +#: ../glib/gregex.c:459 msgid "octal value is greater than \\377" msgstr "" -#: ../glib/gregex.c:464 +#: ../glib/gregex.c:463 msgid "overran compiling workspace" msgstr "" -#: ../glib/gregex.c:468 +#: ../glib/gregex.c:467 msgid "previously-checked referenced subpattern not found" msgstr "" -#: ../glib/gregex.c:471 +#: ../glib/gregex.c:470 msgid "DEFINE group contains more than one branch" msgstr "" -#: ../glib/gregex.c:474 +#: ../glib/gregex.c:473 msgid "inconsistent NEWLINE options" msgstr "" -#: ../glib/gregex.c:477 +#: ../glib/gregex.c:476 msgid "" "\\g is not followed by a braced, angle-bracketed, or quoted name or number, " "or by a plain number" msgstr "" -#: ../glib/gregex.c:481 +#: ../glib/gregex.c:480 msgid "a numbered reference must not be zero" msgstr "" -#: ../glib/gregex.c:484 +#: ../glib/gregex.c:483 msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)" msgstr "" -#: ../glib/gregex.c:487 +#: ../glib/gregex.c:486 msgid "(*VERB) not recognized" msgstr "(*VERB) танылмады" -#: ../glib/gregex.c:490 +#: ../glib/gregex.c:489 msgid "number is too big" msgstr "Ñан тым үлкен" -#: ../glib/gregex.c:493 +#: ../glib/gregex.c:492 msgid "missing subpattern name after (?&" msgstr "" -#: ../glib/gregex.c:496 +#: ../glib/gregex.c:495 msgid "digit expected after (?+" msgstr "(?+ кейін Ñан күтілген" -#: ../glib/gregex.c:499 +#: ../glib/gregex.c:498 msgid "] is an invalid data character in JavaScript compatibility mode" msgstr "" -#: ../glib/gregex.c:502 +#: ../glib/gregex.c:501 msgid "different names for subpatterns of the same number are not allowed" msgstr "" -#: ../glib/gregex.c:505 +#: ../glib/gregex.c:504 msgid "(*MARK) must have an argument" msgstr "" -#: ../glib/gregex.c:508 +#: ../glib/gregex.c:507 msgid "\\c must be followed by an ASCII character" msgstr "" -#: ../glib/gregex.c:511 +#: ../glib/gregex.c:510 msgid "\\k is not followed by a braced, angle-bracketed, or quoted name" msgstr "" -#: ../glib/gregex.c:514 +#: ../glib/gregex.c:513 msgid "\\N is not supported in a class" msgstr "" -#: ../glib/gregex.c:517 +#: ../glib/gregex.c:516 msgid "too many forward references" msgstr "" -#: ../glib/gregex.c:520 +#: ../glib/gregex.c:519 msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)" msgstr "" -#: ../glib/gregex.c:523 +#: ../glib/gregex.c:522 msgid "character value in \\u.... sequence is too large" msgstr "" -#: ../glib/gregex.c:746 ../glib/gregex.c:1977 +#: ../glib/gregex.c:745 ../glib/gregex.c:1977 #, c-format msgid "Error while matching regular expression %s: %s" msgstr "" -#: ../glib/gregex.c:1317 +#: ../glib/gregex.c:1316 msgid "PCRE library is compiled without UTF8 support" msgstr "" -#: ../glib/gregex.c:1321 +#: ../glib/gregex.c:1320 msgid "PCRE library is compiled without UTF8 properties support" msgstr "" -#: ../glib/gregex.c:1329 +#: ../glib/gregex.c:1328 msgid "PCRE library is compiled with incompatible options" msgstr "" -#: ../glib/gregex.c:1358 +#: ../glib/gregex.c:1357 #, c-format msgid "Error while optimizing regular expression %s: %s" msgstr "" -#: ../glib/gregex.c:1438 +#: ../glib/gregex.c:1437 #, c-format msgid "Error while compiling regular expression %s at char %d: %s" msgstr "" @@ -4874,236 +4864,253 @@ msgstr "белгіÑіз escape тізбегі" msgid "Error while parsing replacement text “%s†at char %lu: %s" msgstr "" -#: ../glib/gshell.c:96 +#: ../glib/gshell.c:94 msgid "Quoted text doesn’t begin with a quotation mark" msgstr "" -#: ../glib/gshell.c:186 +#: ../glib/gshell.c:184 msgid "Unmatched quotation mark in command line or other shell-quoted text" msgstr "" -#: ../glib/gshell.c:582 +#: ../glib/gshell.c:580 #, c-format msgid "Text ended just after a “\\†character. (The text was “%sâ€)" msgstr "" -#: ../glib/gshell.c:589 +#: ../glib/gshell.c:587 #, c-format msgid "Text ended before matching quote was found for %c. (The text was “%sâ€)" msgstr "" -#: ../glib/gshell.c:601 +#: ../glib/gshell.c:599 msgid "Text was empty (or contained only whitespace)" msgstr "Мәтін Ð±Ð¾Ñ Ð±Ð¾Ð»Ð´Ñ‹ (немеÑе тек Ð±Ð¾Ñ Ð°Ñ€Ð°Ð»Ñ‹Ò›Ñ‚Ð°Ð½ тұрды)" -#: ../glib/gspawn.c:209 +#: ../glib/gspawn.c:250 #, c-format msgid "Failed to read data from child process (%s)" msgstr "" -#: ../glib/gspawn.c:353 +#: ../glib/gspawn.c:394 #, c-format msgid "Unexpected error in select() reading data from a child process (%s)" msgstr "" -#: ../glib/gspawn.c:438 +#: ../glib/gspawn.c:479 #, c-format msgid "Unexpected error in waitpid() (%s)" msgstr "" -#: ../glib/gspawn.c:844 ../glib/gspawn-win32.c:1233 +#: ../glib/gspawn.c:886 ../glib/gspawn-win32.c:1231 #, c-format msgid "Child process exited with code %ld" msgstr "" -#: ../glib/gspawn.c:852 +#: ../glib/gspawn.c:894 #, c-format msgid "Child process killed by signal %ld" msgstr "" -#: ../glib/gspawn.c:859 +#: ../glib/gspawn.c:901 #, c-format msgid "Child process stopped by signal %ld" msgstr "" -#: ../glib/gspawn.c:866 +#: ../glib/gspawn.c:908 #, c-format msgid "Child process exited abnormally" msgstr "" -#: ../glib/gspawn.c:1271 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347 +#: ../glib/gspawn.c:1313 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345 #, c-format msgid "Failed to read from child pipe (%s)" msgstr "" -#: ../glib/gspawn.c:1341 +#: ../glib/gspawn.c:1383 #, c-format msgid "Failed to fork (%s)" msgstr "" -#: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370 +#: ../glib/gspawn.c:1532 ../glib/gspawn-win32.c:368 #, c-format msgid "Failed to change to directory “%s†(%s)" msgstr "\"%s\" бумаÑына ауыÑу ÑәтÑіз аÑқталды (%s)" -#: ../glib/gspawn.c:1500 +#: ../glib/gspawn.c:1542 #, c-format -#| msgid "Failed to execute helper program (%s)" msgid "Failed to execute child process “%s†(%s)" msgstr "" -#: ../glib/gspawn.c:1510 +#: ../glib/gspawn.c:1552 #, c-format msgid "Failed to redirect output or input of child process (%s)" msgstr "" -#: ../glib/gspawn.c:1519 +#: ../glib/gspawn.c:1561 #, c-format msgid "Failed to fork child process (%s)" msgstr "" -#: ../glib/gspawn.c:1527 +#: ../glib/gspawn.c:1569 #, c-format msgid "Unknown error executing child process “%sâ€" msgstr "" -#: ../glib/gspawn.c:1551 +#: ../glib/gspawn.c:1593 #, c-format msgid "Failed to read enough data from child pid pipe (%s)" msgstr "" -#: ../glib/gspawn-win32.c:283 +#: ../glib/gspawn-win32.c:281 msgid "Failed to read data from child process" msgstr "" -#: ../glib/gspawn-win32.c:300 +#: ../glib/gspawn-win32.c:298 #, c-format msgid "Failed to create pipe for communicating with child process (%s)" msgstr "" -#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495 +#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493 #, c-format msgid "Failed to execute child process (%s)" msgstr "" -#: ../glib/gspawn-win32.c:445 +#: ../glib/gspawn-win32.c:443 #, c-format msgid "Invalid program name: %s" msgstr "Бағдарлама аты қате: %s" -#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722 -#: ../glib/gspawn-win32.c:1297 +#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720 #, c-format msgid "Invalid string in argument vector at %d: %s" msgstr "" -#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737 -#: ../glib/gspawn-win32.c:1330 +#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735 #, c-format msgid "Invalid string in environment: %s" msgstr "" -#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278 +#: ../glib/gspawn-win32.c:716 #, c-format msgid "Invalid working directory: %s" msgstr "Ð–Ò±Ð¼Ñ‹Ñ Ð±ÑƒÐ¼Ð°ÑÑ‹ қате: %s" -#: ../glib/gspawn-win32.c:783 +#: ../glib/gspawn-win32.c:781 #, c-format msgid "Failed to execute helper program (%s)" msgstr "Көмекші бағдарламаны орындау қатеÑÑ– (%s)" -#: ../glib/gspawn-win32.c:997 +#: ../glib/gspawn-win32.c:995 msgid "" "Unexpected error in g_io_channel_win32_poll() reading data from a child " "process" msgstr "" -#: ../glib/gutf8.c:797 +#: ../glib/gstrfuncs.c:3237 ../glib/gstrfuncs.c:3338 +msgid "Empty string is not a number" +msgstr "" + +#: ../glib/gstrfuncs.c:3261 +#, c-format +#| msgid "'%s' is not a valid name" +msgid "“%s†is not a signed number" +msgstr "\"%s\" таңбаÑÑ‹ бар Ñан емеÑ" + +#: ../glib/gstrfuncs.c:3271 ../glib/gstrfuncs.c:3374 +#, c-format +msgid "Number “%s†is out of bounds [%s, %s]" +msgstr "" + +#: ../glib/gstrfuncs.c:3364 +#, c-format +msgid "“%s†is not an unsigned number" +msgstr "\"%s\" таңбаÑÑ‹ жоқ Ñан емеÑ" + +#: ../glib/gutf8.c:798 msgid "Failed to allocate memory" msgstr "Жадыны бөлу ÑәтÑіз" -#: ../glib/gutf8.c:930 +#: ../glib/gutf8.c:931 msgid "Character out of range for UTF-8" msgstr "" -#: ../glib/gutf8.c:1031 ../glib/gutf8.c:1040 ../glib/gutf8.c:1170 -#: ../glib/gutf8.c:1179 ../glib/gutf8.c:1318 ../glib/gutf8.c:1415 +#: ../glib/gutf8.c:1032 ../glib/gutf8.c:1041 ../glib/gutf8.c:1171 +#: ../glib/gutf8.c:1180 ../glib/gutf8.c:1319 ../glib/gutf8.c:1416 msgid "Invalid sequence in conversion input" msgstr "" -#: ../glib/gutf8.c:1329 ../glib/gutf8.c:1426 +#: ../glib/gutf8.c:1330 ../glib/gutf8.c:1427 msgid "Character out of range for UTF-16" msgstr "" -#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272 +#: ../glib/gutils.c:2147 ../glib/gutils.c:2174 ../glib/gutils.c:2280 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u байт" -#: ../glib/gutils.c:2145 +#: ../glib/gutils.c:2153 #, c-format msgid "%.1f KiB" msgstr "%.1f КиБ" -#: ../glib/gutils.c:2147 +#: ../glib/gutils.c:2155 #, c-format msgid "%.1f MiB" msgstr "%.1f МиБ" -#: ../glib/gutils.c:2150 +#: ../glib/gutils.c:2158 #, c-format msgid "%.1f GiB" msgstr "%.1f ГиБ" -#: ../glib/gutils.c:2153 +#: ../glib/gutils.c:2161 #, c-format msgid "%.1f TiB" msgstr "%.1f ТиБ" -#: ../glib/gutils.c:2156 +#: ../glib/gutils.c:2164 #, c-format msgid "%.1f PiB" msgstr "%.1f ПиБ" -#: ../glib/gutils.c:2159 +#: ../glib/gutils.c:2167 #, c-format msgid "%.1f EiB" msgstr "%.1f ÐиБ" -#: ../glib/gutils.c:2172 +#: ../glib/gutils.c:2180 #, c-format msgid "%.1f kB" msgstr "%.1f КБ" -#: ../glib/gutils.c:2175 ../glib/gutils.c:2290 +#: ../glib/gutils.c:2183 ../glib/gutils.c:2298 #, c-format msgid "%.1f MB" msgstr "%.1f МБ" -#: ../glib/gutils.c:2178 ../glib/gutils.c:2295 +#: ../glib/gutils.c:2186 ../glib/gutils.c:2303 #, c-format msgid "%.1f GB" msgstr "%.1f ГБ" -#: ../glib/gutils.c:2180 ../glib/gutils.c:2300 +#: ../glib/gutils.c:2188 ../glib/gutils.c:2308 #, c-format msgid "%.1f TB" msgstr "%.1f ТБ" -#: ../glib/gutils.c:2183 ../glib/gutils.c:2305 +#: ../glib/gutils.c:2191 ../glib/gutils.c:2313 #, c-format msgid "%.1f PB" msgstr "%.1f ПБ" -#: ../glib/gutils.c:2186 ../glib/gutils.c:2310 +#: ../glib/gutils.c:2194 ../glib/gutils.c:2318 #, c-format msgid "%.1f EB" msgstr "%.1f ÐБ" #. Translators: the %s in "%s bytes" will always be replaced by a number. -#: ../glib/gutils.c:2223 +#: ../glib/gutils.c:2231 #, c-format msgid "%s byte" msgid_plural "%s bytes" @@ -5114,11 +5121,32 @@ msgstr[0] "%s байт" #. * compatibility. Users will not see this string unless a program is using this deprecated function. #. * Please translate as literally as possible. #. -#: ../glib/gutils.c:2285 +#: ../glib/gutils.c:2293 #, c-format msgid "%.1f KB" msgstr "%.1f КБ" +#~ msgid "No files given" +#~ msgstr "Файлдар көрÑетілмеген" + +#~ msgid "Error mounting location: %s\n" +#~ msgstr "ОрналаÑуды тіркеу қатеÑÑ–: %s\n" + +#~ msgid "Error unmounting mount: %s\n" +#~ msgstr "Тіркеуден боÑату қатеÑÑ–: %s\n" + +#~ msgid "Error mounting %s: %s\n" +#~ msgstr "%s тіркеу қатеÑÑ–: %s\n" + +#~ msgid "No files to open" +#~ msgstr "Ðшу үшін файлдар жоқ" + +#~ msgid "No files to delete" +#~ msgstr "Өшіру үшін файлдар жоқ" + +#~ msgid "Error setting attribute: %s\n" +#~ msgstr "Ðтрибутты орнату қатеÑÑ–: %s\n" + #~ msgid "Error creating directory '%s': %s" #~ msgstr "'%s' бумаÑын жаÑау қатеÑÑ–: %s" diff --git a/tests/Makefile.am b/tests/Makefile.am index 72af39d40..46231507d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -79,7 +79,7 @@ dist_test_data = \ check_PROGRAMS += $(installed_test_programs) $(installed_test_extra_programs) check_SCRIPTS += $(installed_test_scripts) TESTS += $(installed_test_programs) $(dist_uninstalled_test_extra_scripts) -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ G_TEST_SRCDIR=$(abs_srcdir) \ G_TEST_BUILDDIR=$(abs_builddir) \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 498a57210..6964d69c2 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1116,7 +1116,7 @@ dist_test_data = \ utf8.txt \ $(NULL) -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ G_TEST_SRCDIR=$(abs_srcdir) \ G_TEST_BUILDDIR=$(abs_builddir) \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \ diff --git a/tests/child-test.c b/tests/child-test.c index f7edaee4b..62f7efd37 100644 --- a/tests/child-test.c +++ b/tests/child-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/completion-test.c b/tests/completion-test.c index b5f004fdf..e9664940b 100644 --- a/tests/completion-test.c +++ b/tests/completion-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/dirname-test.c b/tests/dirname-test.c index 4260a051b..d46ef1b9b 100644 --- a/tests/dirname-test.c +++ b/tests/dirname-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/env-test.c b/tests/env-test.c index 6f2189a5c..edf7edda7 100644 --- a/tests/env-test.c +++ b/tests/env-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/file-test.c b/tests/file-test.c index 0a3316f4b..67e7e87ed 100644 --- a/tests/file-test.c +++ b/tests/file-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gio-test.c b/tests/gio-test.c index f0f70cd78..22ae77cff 100644 --- a/tests/gio-test.c +++ b/tests/gio-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am index 16f28278a..656941db1 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -34,7 +34,7 @@ noinst_PROGRAMS += \ # This will cause them to be built even if installed tests are disabled. check_PROGRAMS += $(installed_test_programs) $(installed_test_extra_programs) TESTS += $(installed_test_programs) -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \ MALLOC_CHECK_=2 \ MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) diff --git a/tests/gobject/Makefile.in b/tests/gobject/Makefile.in index 4b5a00488..61f1633e4 100644 --- a/tests/gobject/Makefile.in +++ b/tests/gobject/Makefile.in @@ -875,7 +875,7 @@ test_programs = \ # don't run them under the framework. We will handle them manually below. installed_test_programs = deftype accumulator defaultiface dynamictype \ override signals singleton references $(NULL) $(am__append_15) -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \ MALLOC_CHECK_=2 \ MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) diff --git a/tests/gobject/accumulator.c b/tests/gobject/accumulator.c index 29aa4edda..a41815113 100644 --- a/tests/gobject/accumulator.c +++ b/tests/gobject/accumulator.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/defaultiface.c b/tests/gobject/defaultiface.c index 40a1ebcf9..eccb79ced 100644 --- a/tests/gobject/defaultiface.c +++ b/tests/gobject/defaultiface.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/deftype.c b/tests/gobject/deftype.c index ae46843b7..773aaa1bd 100644 --- a/tests/gobject/deftype.c +++ b/tests/gobject/deftype.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/dynamictype.c b/tests/gobject/dynamictype.c index f61dcb3e0..c3db276cf 100644 --- a/tests/gobject/dynamictype.c +++ b/tests/gobject/dynamictype.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/gvalue-test.c b/tests/gobject/gvalue-test.c index d24bf304f..b73fe3150 100644 --- a/tests/gobject/gvalue-test.c +++ b/tests/gobject/gvalue-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/override.c b/tests/gobject/override.c index 96fc80860..d048a4669 100644 --- a/tests/gobject/override.c +++ b/tests/gobject/override.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/paramspec-test.c b/tests/gobject/paramspec-test.c index 74609dd17..02a964bfa 100644 --- a/tests/gobject/paramspec-test.c +++ b/tests/gobject/paramspec-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/performance-threaded.c b/tests/gobject/performance-threaded.c index af6424cae..521816e59 100644 --- a/tests/gobject/performance-threaded.c +++ b/tests/gobject/performance-threaded.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/performance.c b/tests/gobject/performance.c index a592b7d85..b5613f184 100644 --- a/tests/gobject/performance.c +++ b/tests/gobject/performance.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/references.c b/tests/gobject/references.c index dc959bb22..8c1266042 100644 --- a/tests/gobject/references.c +++ b/tests/gobject/references.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/signals.c b/tests/gobject/signals.c index adcc5f28c..3b1f3b6eb 100644 --- a/tests/gobject/signals.c +++ b/tests/gobject/signals.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/singleton.c b/tests/gobject/singleton.c index 3a6497c90..2795d0e8f 100644 --- a/tests/gobject/singleton.c +++ b/tests/gobject/singleton.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/testcommon.h b/tests/gobject/testcommon.h index c43072fc6..a5b59b3d3 100644 --- a/tests/gobject/testcommon.h +++ b/tests/gobject/testcommon.h @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/testmodule.c b/tests/gobject/testmodule.c index f2c832305..60e18f14e 100644 --- a/tests/gobject/testmodule.c +++ b/tests/gobject/testmodule.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/gobject/testmodule.h b/tests/gobject/testmodule.h index 80a87eef7..e849b4d9c 100644 --- a/tests/gobject/testmodule.h +++ b/tests/gobject/testmodule.h @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/libmoduletestplugin_a.c b/tests/libmoduletestplugin_a.c index 6fbd7ae82..56bd52904 100644 --- a/tests/libmoduletestplugin_a.c +++ b/tests/libmoduletestplugin_a.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/libmoduletestplugin_b.c b/tests/libmoduletestplugin_b.c index 15a6f55c0..e147dd24e 100644 --- a/tests/libmoduletestplugin_b.c +++ b/tests/libmoduletestplugin_b.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/mapping-test.c b/tests/mapping-test.c index 9128e3570..3eb90fa48 100644 --- a/tests/mapping-test.c +++ b/tests/mapping-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/memchunks.c b/tests/memchunks.c index d2c481194..fae7c4107 100644 --- a/tests/memchunks.c +++ b/tests/memchunks.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/module-test.c b/tests/module-test.c index 5a45ed23c..fbf23169f 100644 --- a/tests/module-test.c +++ b/tests/module-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am index f9a98dcd7..6315c6ea0 100644 --- a/tests/refcount/Makefile.am +++ b/tests/refcount/Makefile.am @@ -20,7 +20,7 @@ TESTS += \ signal4 \ $(NULL) -TESTS_ENVIRONMENT = srcdir=$(srcdir) \ +AM_TESTS_ENVIRONMENT = srcdir=$(srcdir) \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset signal1_SOURCES = signals.c diff --git a/tests/refcount/Makefile.in b/tests/refcount/Makefile.in index bf49b61d0..9e155f17a 100644 --- a/tests/refcount/Makefile.in +++ b/tests/refcount/Makefile.in @@ -851,7 +851,7 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installe LDADD = $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gobject/libgobject-2.0.la AM_CPPFLAGS = $(gmodule_INCLUDES) $(GLIB_DEBUG_FLAGS) AM_CFLAGS = -g -TESTS_ENVIRONMENT = srcdir=$(srcdir) \ +AM_TESTS_ENVIRONMENT = srcdir=$(srcdir) \ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset signal1_SOURCES = signals.c diff --git a/tests/relation-test.c b/tests/relation-test.c index ecc838872..4f056aac2 100644 --- a/tests/relation-test.c +++ b/tests/relation-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/slice-color.c b/tests/slice-color.c index f77ff8827..bcbb9709e 100644 --- a/tests/slice-color.c +++ b/tests/slice-color.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/slice-concurrent.c b/tests/slice-concurrent.c index 3c686e85c..66f055265 100644 --- a/tests/slice-concurrent.c +++ b/tests/slice-concurrent.c @@ -5,7 +5,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/slice-test.c b/tests/slice-test.c index 0caedad61..055adba5c 100644 --- a/tests/slice-test.c +++ b/tests/slice-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/sources.c b/tests/sources.c index 93221eda5..e9a8407dc 100644 --- a/tests/sources.c +++ b/tests/sources.c @@ -1,7 +1,7 @@ /* This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/spawn-test.c b/tests/spawn-test.c index 806b93eb8..217cfd941 100644 --- a/tests/spawn-test.c +++ b/tests/spawn-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/testglib.c b/tests/testglib.c index 0a6f79047..e9f7f36bc 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/tests/type-test.c b/tests/type-test.c index 2e91565c7..ed7cc44cf 100644 --- a/tests/type-test.c +++ b/tests/type-test.c @@ -4,7 +4,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/win32/Makefile.am b/win32/Makefile.am index 3a08bd59b..b19d5607d 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -3,4 +3,5 @@ SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15 EXTRA_DIST = \ glibpc.py \ pc_base.py \ - replace.py + replace.py \ + gen_util_scripts.py diff --git a/win32/Makefile.in b/win32/Makefile.in index eb5701677..7644a74d1 100644 --- a/win32/Makefile.in +++ b/win32/Makefile.in @@ -440,7 +440,8 @@ SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15 EXTRA_DIST = \ glibpc.py \ pc_base.py \ - replace.py + replace.py \ + gen_util_scripts.py all: all-recursive diff --git a/win32/gen_util_scripts.py b/win32/gen_util_scripts.py new file mode 100644 index 000000000..50525056e --- /dev/null +++ b/win32/gen_util_scripts.py @@ -0,0 +1,33 @@ +# Simple Python script to generate the full .schema.xml files + +import os +import sys +import argparse + +from replace import replace_multi + +def main(argv): + srcroot = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') + parser = argparse.ArgumentParser(description='Generate Utility Scripts') + parser.add_argument('-t', '--type', help='Script Type (glib-mkenums or gdbus-codegen)', required=True) + parser.add_argument('--version', help='Package Version', required=True) + args = parser.parse_args() + + replace_items = {'@PYTHON@': 'python', + '@PERL_PATH@': 'perl', + '@GLIB_VERSION@': args.version} + + if args.type == 'glib-mkenums': + replace_multi(srcroot + '/gobject/glib-mkenums.in', + srcroot + '/gobject/glib-mkenums', + replace_items) + elif args.type == 'gdbus-codegen': + replace_multi(srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen.in', + srcroot + '/gio/gdbus-2.0/codegen/gdbus-codegen', + replace_items) + + else: + raise ValueError('Type must be glib-mkenums or gdbus-codegen') + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt index ba5878968..001f86b2f 100644 --- a/win32/vs10/README.txt +++ b/win32/vs10/README.txt @@ -28,11 +28,11 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS10 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the instructions
+there on building, as it involves using the Meson build system and possibly
+the Ninja build tool if the Visual Studio project generation is not used
+or is unavailable.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs10/glib-build-defines.props b/win32/vs10/glib-build-defines.props index 6de6fec36..e7606dad8 100644 --- a/win32/vs10/glib-build-defines.props +++ b/win32/vs10/glib-build-defines.props @@ -15,7 +15,7 @@ <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines> <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines> <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines> - <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject";FFI_BUILDING</GObjectBuildDefines> + <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines> <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines> <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs> </PropertyGroup> diff --git a/win32/vs10/glib-gen-srcs.props b/win32/vs10/glib-gen-srcs.props index a9fc09ad5..ff15ea0b3 100644 --- a/win32/vs10/glib-gen-srcs.props +++ b/win32/vs10/glib-gen-srcs.props @@ -8,7 +8,6 @@ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> @@ -26,8 +25,5 @@ <BuildMacro Include="GenGNetworkingH"> <Value>$(GenGNetworkingH)</Value> </BuildMacro> - <BuildMacro Include="GenGLibMKEnums"> - <Value>$(GenGLibMKEnums)</Value> - </BuildMacro> </ItemGroup> </Project> diff --git a/win32/vs10/glib-install.props b/win32/vs10/glib-install.props index 38124ed27..5ecc7c50e 100644 --- a/win32/vs10/glib-install.props +++ b/win32/vs10/glib-install.props @@ -36,7 +36,7 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) @@ -317,7 +317,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -330,9 +333,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin index eeb2965f1..c5b43bb21 100644 --- a/win32/vs10/glib-install.propsin +++ b/win32/vs10/glib-install.propsin @@ -36,8 +36,8 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated @@ -83,7 +83,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -96,9 +99,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs10/glib-install.vcxproj b/win32/vs10/glib-install.vcxproj index cb13a848a..41009b749 100644 --- a/win32/vs10/glib-install.vcxproj +++ b/win32/vs10/glib-install.vcxproj @@ -89,13 +89,29 @@ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\config.h.win32"> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="glib_install_placeholder"> <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> diff --git a/win32/vs10/glib-install.vcxproj.filters b/win32/vs10/glib-install.vcxproj.filters index 2c5e00c4a..6748dcf8f 100644 --- a/win32/vs10/glib-install.vcxproj.filters +++ b/win32/vs10/glib-install.vcxproj.filters @@ -7,7 +7,9 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/win32/vs10/glib-version-paths.props b/win32/vs10/glib-version-paths.props index 36d2727a5..845efc6b5 100644 --- a/win32/vs10/glib-version-paths.props +++ b/win32/vs10/glib-version-paths.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>10</VSVer> - <GlibVersion>2.53.2</GlibVersion> + <GlibVersion>2.53.3</GlibVersion> <ApiVersion>2.0</ApiVersion> <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff --git a/win32/vs10/gobject.vcxproj b/win32/vs10/gobject.vcxproj index d8a784ee7..8095ce849 100644 --- a/win32/vs10/gobject.vcxproj +++ b/win32/vs10/gobject.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -189,16 +189,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs10/gobject.vcxproj.filters b/win32/vs10/gobject.vcxproj.filters index 6f2d383e1..49052de5a 100644 --- a/win32/vs10/gobject.vcxproj.filters +++ b/win32/vs10/gobject.vcxproj.filters @@ -35,11 +35,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs10/gobject.vcxproj.filtersin b/win32/vs10/gobject.vcxproj.filtersin index b9f83075e..85af63ff2 100644 --- a/win32/vs10/gobject.vcxproj.filtersin +++ b/win32/vs10/gobject.vcxproj.filtersin @@ -18,11 +18,6 @@ #include "gobject.vs10.sourcefiles.filters" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs10/gobject.vcxprojin b/win32/vs10/gobject.vcxprojin index c61ef8fd9..a2de0b66c 100644 --- a/win32/vs10/gobject.vcxprojin +++ b/win32/vs10/gobject.vcxprojin @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -172,16 +172,6 @@ #include "gobject.vs10.sourcefiles" </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs11/README.txt b/win32/vs11/README.txt index 6236ce05b..ac9233da3 100644 --- a/win32/vs11/README.txt +++ b/win32/vs11/README.txt @@ -28,11 +28,11 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS11 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the instructions
+there on building, as it involves using the Meson build system and possibly
+the Ninja build tool if the Visual Studio project generation is not used
+or is unavailable.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs11/glib-build-defines.props b/win32/vs11/glib-build-defines.props index 6de6fec36..e7606dad8 100644 --- a/win32/vs11/glib-build-defines.props +++ b/win32/vs11/glib-build-defines.props @@ -15,7 +15,7 @@ <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines> <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines> <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines> - <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject";FFI_BUILDING</GObjectBuildDefines> + <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines> <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines> <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs> </PropertyGroup> diff --git a/win32/vs11/glib-gen-srcs.props b/win32/vs11/glib-gen-srcs.props index a9fc09ad5..ff15ea0b3 100644 --- a/win32/vs11/glib-gen-srcs.props +++ b/win32/vs11/glib-gen-srcs.props @@ -8,7 +8,6 @@ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> @@ -26,8 +25,5 @@ <BuildMacro Include="GenGNetworkingH"> <Value>$(GenGNetworkingH)</Value> </BuildMacro> - <BuildMacro Include="GenGLibMKEnums"> - <Value>$(GenGLibMKEnums)</Value> - </BuildMacro> </ItemGroup> </Project> diff --git a/win32/vs11/glib-install.props b/win32/vs11/glib-install.props index 38124ed27..5ecc7c50e 100644 --- a/win32/vs11/glib-install.props +++ b/win32/vs11/glib-install.props @@ -36,7 +36,7 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) @@ -317,7 +317,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -330,9 +333,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs11/glib-install.vcxproj b/win32/vs11/glib-install.vcxproj index 79425f422..5f42f4ac0 100644 --- a/win32/vs11/glib-install.vcxproj +++ b/win32/vs11/glib-install.vcxproj @@ -89,13 +89,29 @@ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\config.h.win32"> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="glib_install_placeholder"> <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> diff --git a/win32/vs11/glib-install.vcxproj.filters b/win32/vs11/glib-install.vcxproj.filters index 2c5e00c4a..6748dcf8f 100644 --- a/win32/vs11/glib-install.vcxproj.filters +++ b/win32/vs11/glib-install.vcxproj.filters @@ -7,7 +7,9 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/win32/vs11/glib-version-paths.props b/win32/vs11/glib-version-paths.props index 4f6e10727..c95365dfd 100644 --- a/win32/vs11/glib-version-paths.props +++ b/win32/vs11/glib-version-paths.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>11</VSVer> - <GlibVersion>2.53.2</GlibVersion> + <GlibVersion>2.53.3</GlibVersion> <ApiVersion>2.0</ApiVersion> <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff --git a/win32/vs11/gobject.vcxproj b/win32/vs11/gobject.vcxproj index 6d0e97780..3a2116b38 100644 --- a/win32/vs11/gobject.vcxproj +++ b/win32/vs11/gobject.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -189,16 +189,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs11/gobject.vcxproj.filters b/win32/vs11/gobject.vcxproj.filters index 6f2d383e1..49052de5a 100644 --- a/win32/vs11/gobject.vcxproj.filters +++ b/win32/vs11/gobject.vcxproj.filters @@ -35,11 +35,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs12/README.txt b/win32/vs12/README.txt index 3c54070b3..53f5a6215 100644 --- a/win32/vs12/README.txt +++ b/win32/vs12/README.txt @@ -28,11 +28,11 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS12 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the instructions
+there on building, as it involves using the Meson build system and possibly
+the Ninja build tool if the Visual Studio project generation is not used
+or is unavailable.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs12/glib-build-defines.props b/win32/vs12/glib-build-defines.props index 6de6fec36..e7606dad8 100644 --- a/win32/vs12/glib-build-defines.props +++ b/win32/vs12/glib-build-defines.props @@ -15,7 +15,7 @@ <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines> <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines> <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines> - <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject";FFI_BUILDING</GObjectBuildDefines> + <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines> <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines> <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs> </PropertyGroup> diff --git a/win32/vs12/glib-gen-srcs.props b/win32/vs12/glib-gen-srcs.props index a9fc09ad5..ff15ea0b3 100644 --- a/win32/vs12/glib-gen-srcs.props +++ b/win32/vs12/glib-gen-srcs.props @@ -8,7 +8,6 @@ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> @@ -26,8 +25,5 @@ <BuildMacro Include="GenGNetworkingH"> <Value>$(GenGNetworkingH)</Value> </BuildMacro> - <BuildMacro Include="GenGLibMKEnums"> - <Value>$(GenGLibMKEnums)</Value> - </BuildMacro> </ItemGroup> </Project> diff --git a/win32/vs12/glib-install.props b/win32/vs12/glib-install.props index 38124ed27..5ecc7c50e 100644 --- a/win32/vs12/glib-install.props +++ b/win32/vs12/glib-install.props @@ -36,7 +36,7 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) @@ -317,7 +317,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -330,9 +333,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs12/glib-install.vcxproj b/win32/vs12/glib-install.vcxproj index 54115a96d..1ba7fa459 100644 --- a/win32/vs12/glib-install.vcxproj +++ b/win32/vs12/glib-install.vcxproj @@ -89,13 +89,29 @@ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\config.h.win32"> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="glib_install_placeholder"> <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> diff --git a/win32/vs12/glib-install.vcxproj.filters b/win32/vs12/glib-install.vcxproj.filters index 2c5e00c4a..6748dcf8f 100644 --- a/win32/vs12/glib-install.vcxproj.filters +++ b/win32/vs12/glib-install.vcxproj.filters @@ -7,7 +7,9 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/win32/vs12/glib-version-paths.props b/win32/vs12/glib-version-paths.props index 4beda4f14..ca86d23d3 100644 --- a/win32/vs12/glib-version-paths.props +++ b/win32/vs12/glib-version-paths.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>12</VSVer> - <GlibVersion>2.53.2</GlibVersion> + <GlibVersion>2.53.3</GlibVersion> <ApiVersion>2.0</ApiVersion> <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff --git a/win32/vs12/gobject.vcxproj b/win32/vs12/gobject.vcxproj index 2ce67d416..42345715c 100644 --- a/win32/vs12/gobject.vcxproj +++ b/win32/vs12/gobject.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -189,16 +189,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs12/gobject.vcxproj.filters b/win32/vs12/gobject.vcxproj.filters index 6f2d383e1..49052de5a 100644 --- a/win32/vs12/gobject.vcxproj.filters +++ b/win32/vs12/gobject.vcxproj.filters @@ -35,11 +35,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs14/README.txt b/win32/vs14/README.txt index 1ab2cc9ff..5830b4da9 100644 --- a/win32/vs14/README.txt +++ b/win32/vs14/README.txt @@ -28,11 +28,11 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS14 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the instructions
+there on building, as it involves using the Meson build system and possibly
+the Ninja build tool if the Visual Studio project generation is not used
+or is unavailable.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs14/glib-build-defines.props b/win32/vs14/glib-build-defines.props index 6de6fec36..e7606dad8 100644 --- a/win32/vs14/glib-build-defines.props +++ b/win32/vs14/glib-build-defines.props @@ -15,7 +15,7 @@ <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines> <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines> <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines> - <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject";FFI_BUILDING</GObjectBuildDefines> + <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines> <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines> <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs> </PropertyGroup> diff --git a/win32/vs14/glib-gen-srcs.props b/win32/vs14/glib-gen-srcs.props index a9fc09ad5..ff15ea0b3 100644 --- a/win32/vs14/glib-gen-srcs.props +++ b/win32/vs14/glib-gen-srcs.props @@ -8,7 +8,6 @@ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> @@ -26,8 +25,5 @@ <BuildMacro Include="GenGNetworkingH"> <Value>$(GenGNetworkingH)</Value> </BuildMacro> - <BuildMacro Include="GenGLibMKEnums"> - <Value>$(GenGLibMKEnums)</Value> - </BuildMacro> </ItemGroup> </Project> diff --git a/win32/vs14/glib-install.props b/win32/vs14/glib-install.props index 38124ed27..5ecc7c50e 100644 --- a/win32/vs14/glib-install.props +++ b/win32/vs14/glib-install.props @@ -36,7 +36,7 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) @@ -317,7 +317,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -330,9 +333,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs14/glib-install.vcxproj b/win32/vs14/glib-install.vcxproj index 5077cd547..4673412b4 100644 --- a/win32/vs14/glib-install.vcxproj +++ b/win32/vs14/glib-install.vcxproj @@ -89,13 +89,29 @@ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\config.h.win32"> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="glib_install_placeholder"> <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> diff --git a/win32/vs14/glib-install.vcxproj.filters b/win32/vs14/glib-install.vcxproj.filters index 2c5e00c4a..6748dcf8f 100644 --- a/win32/vs14/glib-install.vcxproj.filters +++ b/win32/vs14/glib-install.vcxproj.filters @@ -7,7 +7,9 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/win32/vs14/glib-version-paths.props b/win32/vs14/glib-version-paths.props index 9e075340d..6eb1e6238 100644 --- a/win32/vs14/glib-version-paths.props +++ b/win32/vs14/glib-version-paths.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>14</VSVer> - <GlibVersion>2.53.2</GlibVersion> + <GlibVersion>2.53.3</GlibVersion> <ApiVersion>2.0</ApiVersion> <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff --git a/win32/vs14/gobject.vcxproj b/win32/vs14/gobject.vcxproj index 14a255a29..b9c3c0add 100644 --- a/win32/vs14/gobject.vcxproj +++ b/win32/vs14/gobject.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -189,16 +189,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs14/gobject.vcxproj.filters b/win32/vs14/gobject.vcxproj.filters index 6f2d383e1..49052de5a 100644 --- a/win32/vs14/gobject.vcxproj.filters +++ b/win32/vs14/gobject.vcxproj.filters @@ -35,11 +35,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs15/README.txt b/win32/vs15/README.txt index 8c6da9326..7807c0a76 100644 --- a/win32/vs15/README.txt +++ b/win32/vs15/README.txt @@ -28,11 +28,11 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS15 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the instructions
+there on building, as it involves using the Meson build system and possibly
+the Ninja build tool if the Visual Studio project generation is not used
+or is unavailable.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs15/glib-build-defines.props b/win32/vs15/glib-build-defines.props index 6de6fec36..e7606dad8 100644 --- a/win32/vs15/glib-build-defines.props +++ b/win32/vs15/glib-build-defines.props @@ -15,7 +15,7 @@ <GLibBuildDefines>$(GLibInBuildMacro);$(DllExportDefines);G_LOG_DOMAIN="GLib"</GLibBuildDefines> <GThreadBuildDefines>G_LOG_DOMAIN="GThread"</GThreadBuildDefines> <GModuleBuildDefines>G_LOG_DOMAIN="GModule"</GModuleBuildDefines> - <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject";FFI_BUILDING</GObjectBuildDefines> + <GObjectBuildDefines>GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN="GLib-GObject"</GObjectBuildDefines> <GioBuildDefines>$(GioInBuildMacro);G_LOG_DOMAIN="GLib-GIO";$(DllExportDefines)</GioBuildDefines> <WindowsNetworkingLibs>ws2_32.lib;shlwapi.lib;dnsapi.lib;iphlpapi.lib</WindowsNetworkingLibs> </PropertyGroup> diff --git a/win32/vs15/glib-gen-srcs.props b/win32/vs15/glib-gen-srcs.props index a9fc09ad5..ff15ea0b3 100644 --- a/win32/vs15/glib-gen-srcs.props +++ b/win32/vs15/glib-gen-srcs.props @@ -8,7 +8,6 @@ <GenGLibConfigH>copy ..\..\glib\glibconfig.h.win32 ..\..\glib\glibconfig.h</GenGLibConfigH> <GenGModuleConfH>copy ..\..\gmodule\gmoduleconf.h.win32 ..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGNetworkingH>copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h</GenGNetworkingH> - <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)</GenGLibMKEnums> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> @@ -26,8 +25,5 @@ <BuildMacro Include="GenGNetworkingH"> <Value>$(GenGNetworkingH)</Value> </BuildMacro> - <BuildMacro Include="GenGLibMKEnums"> - <Value>$(GenGLibMKEnums)</Value> - </BuildMacro> </ItemGroup> </Project> diff --git a/win32/vs15/glib-install.props b/win32/vs15/glib-install.props index 38124ed27..5ecc7c50e 100644 --- a/win32/vs15/glib-install.props +++ b/win32/vs15/glib-install.props @@ -36,7 +36,7 @@ copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin copy $(BinDir)\gio.exe $(CopyDir)\bin copy $(BinDir)\gio.pdb $(CopyDir)\bin -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) @@ -317,7 +317,10 @@ copy ..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen </GlibDoInstall> + <GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts> <GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles> + <GenGLibMKEnums>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)</GenGLibMKEnums> + <GenGDBusCodegen>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)</GenGDBusCodegen> <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC> </PropertyGroup> <PropertyGroup> @@ -330,9 +333,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege <BuildMacro Include="GlibDoInstall"> <Value>$(GlibDoInstall)</Value> </BuildMacro> + <BuildMacro Include="GlibUtilScripts"> + <Value>$(GlibUtilScripts)</Value> + </BuildMacro> <BuildMacro Include="GlibPCFiles"> <Value>$(GlibPCFiles)</Value> </BuildMacro> + <BuildMacro Include="GenGLibMKEnums"> + <Value>$(GenGLibMKEnums)</Value> + </BuildMacro> + <BuildMacro Include="GenGDBusCodegen"> + <Value>$(GenGDBusCodegen)</Value> + </BuildMacro> <BuildMacro Include="GlibGenPC"> <Value>$(GlibGenPC)</Value> </BuildMacro> diff --git a/win32/vs15/glib-install.vcxproj b/win32/vs15/glib-install.vcxproj index c4e042d04..b4f26a183 100644 --- a/win32/vs15/glib-install.vcxproj +++ b/win32/vs15/glib-install.vcxproj @@ -89,13 +89,29 @@ <Command Condition="'$(Configuration)'=='Release'">$(GlibGenPC)</Command> <Outputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);%(Outputs)</Outputs> </CustomBuild> - <CustomBuild Include="..\..\config.h.win32"> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <Message Condition="'$(Configuration)'=='Debug'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Debug'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + <Message Condition="'$(Configuration)'=='Release'">Generating gdbus-codegen...</Message> + <Command Condition="'$(Configuration)'=='Release'">$(GenGDBusCodegen)</Command> + <Outputs Condition="'$(Configuration)'=='Release'">..\..\gio\gdbus-2.0\codegen\gdbus-codegen;%(Outputs)</Outputs> + </CustomBuild> + <CustomBuild Include="glib_install_placeholder"> <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Debug'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs> <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message> - <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GlibPCFiles);$(GlibUtilScripts)</AdditionalInputs> <Command Condition="'$(Configuration)'=='Release'">$(GlibDoInstall)</Command> <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs> </CustomBuild> diff --git a/win32/vs15/glib-install.vcxproj.filters b/win32/vs15/glib-install.vcxproj.filters index 2c5e00c4a..6748dcf8f 100644 --- a/win32/vs15/glib-install.vcxproj.filters +++ b/win32/vs15/glib-install.vcxproj.filters @@ -7,7 +7,9 @@ </Filter> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"><Filter>Resource Files</Filter></CustomBuild> + <CustomBuild Include="glib_install_placeholder"><Filter>Resource Files</Filter></CustomBuild> <CustomBuild Include="..\glibpc.py"><Filter>Resource Files</Filter></CustomBuild> </ItemGroup> </Project> diff --git a/win32/vs15/glib-version-paths.props b/win32/vs15/glib-version-paths.props index 5d3ef0f98..f9b4d1b72 100644 --- a/win32/vs15/glib-version-paths.props +++ b/win32/vs15/glib-version-paths.props @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <VSVer>15</VSVer> - <GlibVersion>2.53.2</GlibVersion> + <GlibVersion>2.53.3</GlibVersion> <ApiVersion>2.0</ApiVersion> <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> diff --git a/win32/vs15/gobject.vcxproj b/win32/vs15/gobject.vcxproj index 1720e8d95..b54b240db 100644 --- a/win32/vs15/gobject.vcxproj +++ b/win32/vs15/gobject.vcxproj @@ -51,19 +51,19 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="glib-gen-srcs.props" /> + <Import Project="glib-build-defines.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -83,7 +83,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -105,7 +105,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -132,7 +132,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -154,7 +154,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> - <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).pdb</ProgramDatabaseFile> @@ -189,16 +189,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"> - <Message Condition="'$(Configuration)'=='Debug'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Debug'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - <Message Condition="'$(Configuration)'=='Release'">Generating glib-mkenums...</Message> - <Command Condition="'$(Configuration)'=='Release'">$(GenGLibMKEnums)</Command> - <Outputs Condition="'$(Configuration)'=='Release'">..\..\gobject\glib-mkenums;%(Outputs)</Outputs> - </CustomBuild> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\..\gobject\gobject.rc" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs15/gobject.vcxproj.filters b/win32/vs15/gobject.vcxproj.filters index 6f2d383e1..49052de5a 100644 --- a/win32/vs15/gobject.vcxproj.filters +++ b/win32/vs15/gobject.vcxproj.filters @@ -35,11 +35,6 @@ <ClCompile Include="..\..\gobject\gvaluetypes.c"><Filter>Source Files</Filter></ClCompile> </ItemGroup> <ItemGroup> - <CustomBuild Include="..\..\gobject\glib-mkenums.in"><Filter>Resource Files</Filter></CustomBuild> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\..\gobject\gobject.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> + <ResourceCompile Include="..\..\gobject\gobject.rc"><Filter>Resource Files</Filter></ResourceCompile> </ItemGroup> </Project> diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt index 158f14570..1625b71eb 100644 --- a/win32/vs9/README.txt +++ b/win32/vs9/README.txt @@ -28,11 +28,10 @@ One may wish to build his/her own ZLib-It is recommended that ZLib is built using the win32/Makefile.msc makefile with VS9 with the ASM routines
to avoid linking problems-see win32/Makefile.msc in ZLib for more details.
-For LibFFI, please get version 3.0.10 or later, as Visual C++ build support
-was added in the 3.0.10 release series. Please see the README file that
-comes with the LibFFI source package for more details on how to build LibFFI
-on Visual C++-please note that the mozilla-build package from Mozilla is needed
-in order to build LibFFI on Windows.
+For LibFFI, please use the Centricular fork of it, which can be found at
+https://github.com/centricular/libffi. Please refer to the build instructions
+there on how to build it, which involves using the Meson build system, and
+the Ninja build tool.
Please note, although using one's own existing PCRE installation to build GLib
is possible, it is still recommended to build PCRE during the process of building
diff --git a/win32/vs9/glib-build-defines.vsprops b/win32/vs9/glib-build-defines.vsprops index 7e28cc5d0..36fce8667 100644 --- a/win32/vs9/glib-build-defines.vsprops +++ b/win32/vs9/glib-build-defines.vsprops @@ -65,7 +65,7 @@ /> <UserMacro Name="GObjectBuildDefines" - Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\"GLib-GObject\";FFI_BUILDING" + Value="GOBJECT_COMPILATION;$(DllExportDefines);G_LOG_DOMAIN=\"GLib-GObject\"" /> <UserMacro Name="GioBuildDefines" diff --git a/win32/vs9/glib-gen-srcs.vsprops b/win32/vs9/glib-gen-srcs.vsprops index de0b1b965..02a6a5a8c 100644 --- a/win32/vs9/glib-gen-srcs.vsprops +++ b/win32/vs9/glib-gen-srcs.vsprops @@ -21,8 +21,4 @@ Name="GenGNetworkingH" Value="copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h" /> - <UserMacro - Name="GenGLibMKEnums" - Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)" - /> </VisualStudioPropertySheet> diff --git a/win32/vs9/glib-install.vcproj b/win32/vs9/glib-install.vcproj index 7324f0f72..a2e31a4b7 100644 --- a/win32/vs9/glib-install.vcproj +++ b/win32/vs9/glib-install.vcproj @@ -114,6 +114,74 @@ /> </FileConfiguration> </File> + <File RelativePath="..\..\gobject\glib-mkenums.in"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating glib-mkenums..." + CommandLine="$(GenGLibMKEnums)" + Outputs="..\..\gobject\glib-mkenums" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating glib-mkenums..." + CommandLine="$(GenGLibMKEnums)" + Outputs="..\..\gobject\glib-mkenums" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating glib-mkenums..." + CommandLine="$(GenGLibMKEnums)" + Outputs="..\..\gobject\glib-mkenums" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating glib-mkenums..." + CommandLine="$(GenGLibMKEnums)" + Outputs="..\..\gobject\glib-mkenums" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in"> + <FileConfiguration Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating gdbus-codegen..." + CommandLine="$(GenGDBusCodegen)" + Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating gdbus-codegen..." + CommandLine="$(GenGDBusCodegen)" + Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating gdbus-codegen..." + CommandLine="$(GenGDBusCodegen)" + Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Generating gdbus-codegen..." + CommandLine="$(GenGDBusCodegen)" + Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen" + /> + </FileConfiguration> + </File> </Filter> </Files> </VisualStudioProject> diff --git a/win32/vs9/glib-install.vsprops b/win32/vs9/glib-install.vsprops index 2a9abf5b7..31625da32 100644 --- a/win32/vs9/glib-install.vsprops +++ b/win32/vs9/glib-install.vsprops @@ -38,7 +38,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin
 -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
 +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin
 if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
 mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 copy ..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion)
 @@ -321,6 +321,14 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege " /> <UserMacro + Name="GenGLibMKEnums" + Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)" + /> + <UserMacro + Name="GenGDBusCodegen" + Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)" + /> + <UserMacro Name="GlibGenPC" Value="(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))" /> diff --git a/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin index dec524eca..c7b024a9a 100644 --- a/win32/vs9/glib-install.vspropsin +++ b/win32/vs9/glib-install.vspropsin @@ -38,7 +38,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin
 -copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen
 +if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin
 if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin
 mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated
 @@ -86,6 +86,14 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege " /> <UserMacro + Name="GenGLibMKEnums" + Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)" + /> + <UserMacro + Name="GenGDBusCodegen" + Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)" + /> + <UserMacro Name="GlibGenPC" Value="(if not exist $(CopyDir) mkdir $(CopyDir)) & (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))" /> diff --git a/win32/vs9/glib-version-paths.vsprops b/win32/vs9/glib-version-paths.vsprops index 35ffb07b1..38224ac4c 100644 --- a/win32/vs9/glib-version-paths.vsprops +++ b/win32/vs9/glib-version-paths.vsprops @@ -10,7 +10,7 @@ /> <UserMacro Name="GlibVersion" - Value="2.53.2" + Value="2.53.3" /> <UserMacro Name="ApiVersion" diff --git a/win32/vs9/gobject.vcproj b/win32/vs9/gobject.vcproj index 5edd3bfd6..6e6c3a093 100644 --- a/win32/vs9/gobject.vcproj +++ b/win32/vs9/gobject.vcproj @@ -21,7 +21,7 @@ <Configurations> <Configuration Name="Debug|Win32" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" > @@ -38,7 +38,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Release|Win32" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1" @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" GenerateDebugInformation="true" @@ -81,7 +81,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" > @@ -98,7 +98,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -111,7 +111,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1" @@ -126,7 +126,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" GenerateDebugInformation="true" @@ -178,40 +178,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\gobject\glib-mkenums.in"> - <FileConfiguration Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Debug|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Release|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - </File> <File RelativePath="..\..\gobject\gobject.rc" /> </Filter> </Files> diff --git a/win32/vs9/gobject.vcprojin b/win32/vs9/gobject.vcprojin index bc6ce88df..c4c60e770 100644 --- a/win32/vs9/gobject.vcprojin +++ b/win32/vs9/gobject.vcprojin @@ -21,7 +21,7 @@ <Configurations> <Configuration Name="Debug|Win32" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" > @@ -38,7 +38,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Release|Win32" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1" @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" GenerateDebugInformation="true" @@ -81,7 +81,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" > @@ -98,7 +98,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -111,7 +111,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\glib-gen-srcs.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1" @@ -126,7 +126,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libffi.lib" + AdditionalDependencies="ffi.lib" OutputFile="$(OutDir)\$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll" LinkIncremental="1" GenerateDebugInformation="true" @@ -161,40 +161,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - <File RelativePath="..\..\gobject\glib-mkenums.in"> - <FileConfiguration Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Release|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Debug|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - <FileConfiguration Name="Release|x64"> - <Tool - Name="VCCustomBuildTool" - Description="Generating glib-mkenums..." - CommandLine="$(GenGLibMKEnums)" - Outputs="..\..\gobject\glib-mkenums" - /> - </FileConfiguration> - </File> <File RelativePath="..\..\gobject\gobject.rc" /> </Filter> </Files> |