commit 4c64e75ec59317cf36d2bb9765c56477acf2acd7 Author: Matthias Clasen Date: Tue Jul 19 20:40:28 2011 -0400 Drop the warnings.sgml template docs/reference/glib/tmpl/.gitignore | 1 + docs/reference/glib/tmpl/warnings.sgml | 236 -------------------------------- glib/gbacktrace.c | 63 +++++++++ glib/gbacktrace.h | 18 +-- glib/gmessages.c | 124 +++++++++++++---- glib/gmessages.h | 81 +++++++++-- 6 files changed, 238 insertions(+), 285 deletions(-) commit d1e5161ab0206adc6f17325152e337d44ae6ec73 Author: Holger Berndt Date: Thu Jun 3 03:22:36 2010 +0200 Document how to unset attributes Unsetting won't work on all attributes. Currently, only metadata attributes are supported. https://bugzilla.gnome.org/show_bug.cgi?id=620423 gio/gfile.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit ec98953e42a20061427b20681d1e31501907e2fa Author: Johan Dahlin Date: Tue Jul 19 14:18:10 2011 -0300 Pass in NULL instead of g_cclosure_marshal_generic NULL is now a shortcut for g_cclosure_marshal_generic, so avoid referencing it directly. https://bugzilla.gnome.org/show_bug.cgi?id=654917 gio/gactiongroup.c | 4 ++-- gio/gapplication.c | 4 ++-- gio/gdbusauthobserver.c | 2 +- gio/gdbusconnection.c | 2 +- gio/gdbusinterfaceskeleton.c | 2 +- gio/gdbusobjectmanager.c | 4 ++-- gio/gdbusobjectmanagerclient.c | 4 ++-- gio/gdbusobjectskeleton.c | 2 +- gio/gdbusproxy.c | 4 ++-- gio/gdbusserver.c | 2 +- gio/gfilemonitor.c | 2 +- gio/gmountoperation.c | 6 +++--- gio/gsettings.c | 4 ++-- gio/gsocketservice.c | 2 +- gio/gthreadedsocketservice.c | 2 +- gio/gtlsconnection.c | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) commit fa2861e3b6109e002b68aa105b5ecbcba88724c1 Author: Johan Dahlin Date: Tue Jul 12 13:39:45 2011 -0300 Use a generic marshaller if one is not specified Since g_cclosure_marshal_generic is always enabled, it makes sense to always use that instead of using generated ones. https://bugzilla.gnome.org/show_bug.cgi?id=654917 gobject/gsignal.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) commit fe6dad271b06e6243d17137c2e0991f56a256cca Author: Ryan Lortie Date: Tue Jul 19 16:12:30 2011 +0200 GSettings: remove key length restrictions The key length now stands effectively unlimited at 1024 characters. https://bugzilla.gnome.org/show_bug.cgi?id=654536 gio/glib-compile-schemas.c | 4 ++-- gio/gsettings.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) commit 9fd0f6c8e23e8cd8353039c99fa73583a7892b4f Author: Matthias Clasen Date: Tue Jul 19 00:02:57 2011 -0400 Fix doc formatting errors glib/gunicode.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit c9379bcfe1423c43b09ea7e979242a3621dab2b2 Author: Matthias Clasen Date: Mon Jul 18 23:58:32 2011 -0400 Move GError docs inline and ditch template docs/reference/glib/tmpl/.gitignore | 1 + docs/reference/glib/tmpl/error_reporting.sgml | 531 ------------------------- glib/gerror.c | 324 +++++++++++++++ glib/gerror.h | 9 + 4 files changed, 334 insertions(+), 531 deletions(-) commit 09e2d2a61c3e9f93f61f5d94b3976bbc4a16839a Author: Matthias Clasen Date: Mon Jul 18 23:23:17 2011 -0400 Move Unicode docs inline, ditch template docs/reference/glib/tmpl/.gitignore | 1 + docs/reference/glib/tmpl/unicode.sgml | 908 --------------------------------- glib/gunicode.h | 424 +++++++++++++--- glib/gunidecomp.c | 23 + 4 files changed, 372 insertions(+), 984 deletions(-) commit 2358616d6ad5c4db4fb037550eb40aeb8886e7ec Author: Matthias Clasen Date: Mon Jul 18 23:00:09 2011 -0400 Remove queue.sgml docs/reference/glib/tmpl/queue.sgml | 438 ----------------------------------- 1 files changed, 0 insertions(+), 438 deletions(-) commit 615977d337c7ba776ac2eda6c688bf6f69316c4d Author: Behdad Esfahbod Date: Mon Jul 18 18:00:40 2011 -0400 Simplify Hangul Jamo decomposition The algorithm is not copy/paste from Unicode anymore, but it's easy enough to follow the logic. glib/gunidecomp.c | 62 ++++++++++++++++------------------------------------ 1 files changed, 19 insertions(+), 43 deletions(-) commit 0584fe33de86f9fd8effe006d911cf5948b4ad05 Author: Behdad Esfahbod Date: Mon Jul 18 17:52:40 2011 -0400 Bug 654651 - Better g_unicode_canonical_decomposition() Add g_unichar_fully_decompose(). Deprecate g_unicode_canonical_decomposition(). docs/reference/glib/glib-sections.txt | 1 + glib/glib.symbols | 3 +- glib/gunicode.h | 9 +++- glib/gunidecomp.c | 78 ++++++++++++++++++++++++++++++-- glib/tests/unicode.c | 66 +++++++++++++++++++++++++++- 5 files changed, 147 insertions(+), 10 deletions(-) commit 7f289c924bdc78bff9b5a96cf9e7c0ed943d64c6 Author: Patrick Welche Date: Mon Jul 18 17:58:01 2011 +0100 Avoid failing arguments to statfs() test on systems which use statvfs. - move choice of statfs vs statvfs from gio/glocalfile.c to configure.ac - if statvfs is the choice, then don't check number of arguments to statfs() - use choice in gio/gunixmounts.c as well https://bugzilla.gnome.org/show_bug.cgi?id=617949 configure.ac | 30 +++++++++++++++++++++++++++++- gio/glocalfile.c | 22 ---------------------- gio/gunixmounts.c | 32 +++++++++++++++++++++++++++++--- 3 files changed, 58 insertions(+), 26 deletions(-) commit 75b30dc51c3926392483094a6228a3646a43e798 Author: Benjamin Otte Date: Mon Jul 18 14:10:35 2011 +0200 gtester: Count inability to run a test in a binary as a failure Previously, when a binary did not run a single test - for whatever reason, from the binary not existing to the binary not using the gtester framework - no failures were recorded. Now we record a non-successful run of a binary that did not start any tests as a failure, too. Note that this does not change the behavior of any binaries that exit successfully or that report the start of any gtester test. glib/gtester.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 4a25d6002341df796e13643695478a4ecb4c7a49 Author: Benjamin Otte Date: Mon Jul 18 13:39:36 2011 +0200 gtester: Return a failure exit code when a test fails Previously, gtester used the testcase_fail_count as the number of tests that failed in the latest run testcase, but then use that as the return value of main(). Now we count the failed testcases of the whole run. glib/gtester.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit dd1316ba92eba170bcba0425ec1b55faeb2bceed Author: Kjartan Maraas Date: Mon Jul 18 13:13:11 2011 +0200 Updated Norwegian bokmål translation po/nb.po | 693 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 362 insertions(+), 331 deletions(-) commit adc325fac0b1b8b0a8c21384f50fc759d2800572 Author: Matthias Clasen Date: Sun Jul 17 23:50:31 2011 -0400 Move version docs inline docs/reference/glib/tmpl/.gitignore | 2 + docs/reference/glib/tmpl/version.sgml | 115 --------------------------------- glib/gutils.c | 40 +++++++++++ glib/gutils.h | 18 +++++ 4 files changed, 60 insertions(+), 115 deletions(-) commit 20cd4936b9d16ee8121d7082d359a76af65081db Author: Matthias Clasen Date: Sun Jul 17 23:38:58 2011 -0400 Move GQueue docs inline glib/gqueue.c | 25 +++++++++++++++ glib/gqueue.h | 91 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 82 insertions(+), 34 deletions(-) commit d3b09eee75f0f433779b0b6a6d9222453bc9df16 Author: Tommi Vainikainen Date: Mon Jul 18 00:45:45 2011 +0300 Updated Finnish translation po/fi.po | 1485 +++++++++++++++++++++++++------------------------------------- 1 files changed, 603 insertions(+), 882 deletions(-) commit d6c30e1766c975dd79e6f252d73c6c0581b64b01 Author: Ryan Lortie Date: Thu Jul 14 18:08:25 2011 +0200 GParamSpec: intern property names Make it so that the ->name property on all GParamSpec objects is an interned string. https://bugzilla.gnome.org/show_bug.cgi?id=654627 gobject/gparam.c | 18 ++++++++++++------ gobject/gparam.h | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) commit 7041b701dd9fd4f617ca762860447d8fc015a2ab Author: Behdad Esfahbod Date: Thu Jul 14 16:53:12 2011 -0400 Remove comp_step_table table Reuse the pre-existing composition data. glib/gen-unicode-tables.pl | 15 +- glib/gunidecomp.c | 66 +--- glib/gunidecomp.h | 1020 -------------------------------------------- 3 files changed, 3 insertions(+), 1098 deletions(-) commit 89a5d17d58c795f835642483bfbd9af6cf09f9fe Author: Behdad Esfahbod Date: Thu Jul 14 16:26:58 2011 -0400 Document, that the second part of a decompose() wouldn't decompose() This is not directly documented in Unicode, or I couldn't find it, but the test I just added confirms that it is currently the case. glib/gunidecomp.c | 7 +++++++ glib/tests/unicode.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) commit f4cf6c3db03440bb42771cf4b43f6c0f3b688e5f Author: Behdad Esfahbod Date: Thu Jul 14 16:22:16 2011 -0400 [test] Move non-utf8 tests into unicode.c glib/tests/Makefile.am | 3 + glib/tests/unicode.c | 548 ++++++++++++++++++++++++++++++++++++++++++++++++ glib/tests/utf8-misc.c | 513 -------------------------------------------- 3 files changed, 551 insertions(+), 513 deletions(-) commit cff4b5b3a3bceeccd63a895ed795c31f7a20fcf0 Author: Behdad Esfahbod Date: Thu Jul 14 16:19:46 2011 -0400 Remove stale comment Unicode guarantees that. glib/gunidecomp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit a73c66b1344c852c18279ba43e951cc71c5839a3 Author: Behdad Esfahbod Date: Thu Jul 14 16:18:30 2011 -0400 Add tests for Unicode canonical composition/decomposition Also update compose()/decompose() API corner cases and docs. glib/gunidecomp.c | 25 ++++++++++- glib/tests/utf8-misc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 128 insertions(+), 4 deletions(-) commit 7ad2f0eb803dee72beb49dc9a22d2b9578d2e8b8 Author: Behdad Esfahbod Date: Wed Jul 13 23:18:53 2011 -0400 Move declarations around So g_unichar API comes before g_utf8. glib/gunicode.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit 761a1841eebedefeb7dc3675e442a56309f347c9 Author: Matthias Clasen Date: Wed Jul 13 22:07:11 2011 -0400 Bug 654195 - Add g_unichar_compose() and g_unichar_decompose() docs/reference/glib/glib-sections.txt | 2 + glib/gen-unicode-tables.pl | 40 + glib/glib.symbols | 2 + glib/gunicode.h | 9 + glib/gunidecomp.c | 189 ++- glib/gunidecomp.h | 3080 +++++++++++++++++++++++++++++++++ 6 files changed, 3321 insertions(+), 1 deletions(-) commit 8c7de592ff961410de0e8507d2334b4f18bc9a58 Author: Ihar Hrachyshka Date: Wed Jul 13 23:36:37 2011 +0300 Updated Belarusian translation. po/be.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit f45631bebc62b60dec1e1021923a0dc27d9e2be3 Author: Ihar Hrachyshka Date: Wed Jul 13 23:30:49 2011 +0300 Updated Belarusian translation. po/be.po | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) commit 09bba9fc60eb5d8c3156a0e907856a12037fe36a Author: Aurimas Černius Date: Tue Jul 12 23:21:25 2011 +0300 Updated Lithuanian translation po/lt.po | 2113 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 1095 insertions(+), 1018 deletions(-) commit 8926b612c8fce41db5bf72f87cce54f16079cd09 Author: Changwoo Ryu Date: Wed Jul 13 02:51:03 2011 +0900 Updated Korean translation po/ko.po | 1172 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 626 insertions(+), 546 deletions(-) commit 8f5e0cd24016cdf852a809dfb7b1356328542201 Author: Ryan Lortie Date: Tue Jul 12 02:56:57 2011 +0200 GDBusInterfaceSkeleton: fix odd use of floating refs The get_properties() function was documented as returning a floating Switch it over to returning a normal reference and patch a couple of uses. https://bugzilla.gnome.org/show_bug.cgi?id=654394 gio/gdbusinterfaceskeleton.c | 5 ++--- gio/gdbusinterfaceskeleton.h | 2 +- gio/gdbusobjectmanagerserver.c | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) commit 58c247e51bfc7d7ff4ed3b351ba4fdab0f012bac Author: Ryan Lortie Date: Mon Jul 11 14:27:53 2011 +0200 GVariant: add g_variant_take_ref() This function implements the following logic: if (g_variant_is_floating (value)) g_variant_ref_sink (value); which is used for consuming the return value of callbacks that may or may not return floating references. This patch also replaces a few instances of the above code with the new function (GSettings, GDBus) and lifts a long-standing restriction on the use of floating values as the return value for signal handlers by improving g_value_take_variant(). https://bugzilla.gnome.org/show_bug.cgi?id=627974 docs/reference/glib/glib-sections.txt | 1 + gio/gdbus-codegen/codegen.py | 3 +- gio/gdbusconnection.c | 6 +-- gio/gsettings.c | 3 +- glib/glib.symbols | 1 + glib/gvariant-core.c | 51 ++++++++++++++++++++++++++++++++- glib/gvariant.h | 1 + gobject/gvaluetypes.c | 14 ++++---- 8 files changed, 64 insertions(+), 16 deletions(-) commit 2121e56ea7399091f6ef169a1da8a11aaa64b5c3 Author: Rudolfs Mazurs Date: Tue Jul 12 16:29:33 2011 +0300 Updated Latvian translation. po/lv.po | 3578 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 2288 insertions(+), 1290 deletions(-) commit bbe7eb09ec71b519adf50ef35bee28d5a1a8e1bd Author: Murray Cumming Date: Tue Jul 12 12:09:31 2011 +0200 Docs: Fixed a typo. gio/gappinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7654a848e2b575eaf278fafe05aa5be1b3afdc26 Author: Tim-Philipp Müller Date: Tue Jul 5 14:30:31 2011 +0100 tests: fix glib_translations_work() If setlocale() to our test locale fails, translations won't work either. https://bugzilla.gnome.org/show_bug.cgi?id=654017 gio/tests/gsettings.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit 5eee90fbbc76ee129d7f846633a667889149ab03 Author: Paolo Bonzini Date: Thu Apr 15 08:23:00 2010 +0200 add g_regex_escape_nul The function can be used to let regex compile non-NUL-terminated strings without redesigning the way the pattern is stored in GRegex objects and retrieved with g_regex_get_pattern. https://bugzilla.gnome.org/show_bug.cgi?id=615895 docs/reference/glib/glib-sections.txt | 1 + glib/glib.symbols | 1 + glib/gregex.c | 68 +++++++++++++++++++++++++++++++++ glib/gregex.h | 2 + glib/tests/regex.c | 42 ++++++++++++++++++++ 5 files changed, 114 insertions(+), 0 deletions(-) commit 653c2f701a3e0a07a808f4e4fca7b846c50c93fa Author: Matthias Clasen Date: Sun Jul 10 23:55:52 2011 -0400 Fix gtk-doc cross-linking among glib/gobject/gio Patch by Daniel Macks, bug 644687. docs/reference/gio/Makefile.am | 3 +++ docs/reference/glib/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) commit 2caddda5341a9a89ccaff4fdb04d638d54a8c635 Author: Matthias Clasen Date: Sun Jul 10 23:11:30 2011 -0400 Take out the timeout from the large-message test This is an attempt to make the test not fail on build slaves, which currently getting a timeout error here. gio/tests/gdbus-connection-slow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 436dbe77444f54bb8fcf7e55085dc60e1fc627a3 Author: Matthias Clasen Date: Sun Jul 10 21:57:45 2011 -0400 Don't test negative values in ulong conversions This is failing on 32bit build slaves. gobject/tests/param.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 7c517bf3501ae68c4a87c8a126955281ad2393b2 Author: Martin Storsjo Date: Wed Jul 6 16:41:44 2011 +0300 Don't needlessly use "echo -e" The -e parameter to echo isn't recognized by echo in POSIX sh, but isn't needed when no escaped characters need to be interpreted. This fixes building glib with a mingw cross compiler on Mac OS X. https://bugzilla.gnome.org/show_bug.cgi?id=654085 gio/Makefile.am | 2 +- glib/Makefile.am | 2 +- gmodule/Makefile.am | 2 +- gobject/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 98b667d052b1274f80b8898a32d0753e9e2e5c1a Author: Matthias Clasen Date: Sun Jul 10 20:42:58 2011 -0400 Optimize g_[s]list_free_full a bit No need to iterate the list twice. Proposed by Luiz Augusto von Dentz, http://bugzilla.gnome.org/show_bug.cgi?id=653935 glib/glist.c | 11 ++++++++--- glib/gslist.c | 17 +++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) commit 182ed958618a098895eb07959c0fb77eb5dcd13c Author: Colin Walters Date: Sun Jul 10 12:19:15 2011 -0400 GCancellable: Make eventfd() fall back to pipes on EINVAL too https://bugzilla.gnome.org/show_bug.cgi?id=654232 gio/gcancellable.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 6079443b4871040b40271d078311500e51f5ec69 Author: Javier Jardón Date: Fri Jul 8 16:15:52 2011 +0100 docs: G_GNUC_DEPRECATED_FOR was added in Glib 2.26 docs/reference/glib/tmpl/macros_misc.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a3557577ef15054a062b0a42363f9b1eaf50ae68 Author: Muhammet Kara Date: Fri Jul 8 01:09:03 2011 +0300 [l10n]Updated Turkish translation po/tr.po | 1274 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 654 insertions(+), 620 deletions(-) commit 7e855ef4616c22210354b3ac1d2d48808fa02b16 Author: Abduxukur Abdurixit Date: Thu Jul 7 16:31:17 2011 +0200 Added UG translation po/ug.po | 439 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 218 insertions(+), 221 deletions(-) commit c2dc66ccf2719df9813b0ab97f22af166770f944 Author: Javier Jardón Date: Wed Jul 6 22:13:05 2011 +0100 Move documentation to inline comments: spawn docs/reference/glib/tmpl/.gitignore | 1 + docs/reference/glib/tmpl/spawn.sgml | 198 ----------------------------------- glib/gspawn.c | 9 ++ glib/gspawn.h | 82 ++++++++++++++ glib/gstring.h | 12 ++ 5 files changed, 104 insertions(+), 198 deletions(-) commit 0e27a71899e7e08075e65cfdfa8b73fd3cb00197 Author: Javier Jardón Date: Wed Jul 6 21:49:55 2011 +0100 Move documentation to inline comments: conversions docs/reference/glib/tmpl/.gitignore | 1 + docs/reference/glib/tmpl/conversions.sgml | 218 ----------------------------- 2 files changed, 1 insertions(+), 218 deletions(-) commit 37ab5ced317342137c60c90feab26e1ac69b6285 Author: Dan Winship Date: Tue Jun 7 17:15:17 2011 -0400 g_output_stream_splice: deal with overflow On 32-bit machines in particular, bytes_written may overflow a gssize. Notice when that happens and just return G_MAXSSIZE instead. https://bugzilla.gnome.org/show_bug.cgi?id=649246 gio/goutputstream.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) commit 3b4a42d631b987714c1062c0c879da30fd40c4c7 Author: Chun-wei Fan Date: Wed Jul 6 09:58:37 2011 +0800 Revert distribution of build/win32/setup.py Revert commit on distribution of this file as it is meant to be used in a GIT checkout only. build/win32/Makefile.am | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit f18ba785cad59cbcae640d30b4cc40af9f020310 Author: Chun-wei Fan Date: Wed Jul 6 08:28:57 2011 +0800 Add build/win32/setup.py to distribution build/win32/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit c83c91a57486fc684ca3d884d6e288972e8b82a7 Author: Chun-wei Fan Date: Wed Jul 6 08:25:41 2011 +0800 Bug 653841: Update README.win32 and VS README.txt's This relates to my previous commit titled "add a script to generator files for building" on behalf of Shixin Zeng. Tell people about the availability of a python script to create the necessary files for a Visual C++ build from a GIT checkout. This is done with the courtesy of Shixin Zeng's python script which does the job and eliminates the troubles of getting a suitable shell environment to do the "make dist" job (which is especially not easy on Windows itself!) README.win32 | 705 ++++++++++++++++++++++--------------------- build/win32/vs10/README.txt | 11 +- build/win32/vs9/README.txt | 11 +- 3 files changed, 372 insertions(+), 355 deletions(-) commit 004e2f060fa1865c8c14fdd399c5f8b3d7048289 Author: Shixin Zeng Date: Wed Jun 29 00:04:14 2011 -0500 add a script to generator files for building Signed-off-by: Chun-wei Fan build/win32/setup.py | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 366 insertions(+), 0 deletions(-) commit 65c6ebddee9f913778c1484b9319229486bf5134 Author: Matthias Clasen Date: Tue Jul 5 11:22:11 2011 -0400 Post-release version bump Up to 2.29.11 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 89df070c1f0893e4a973aa563213dab2d192d83d Author: Matthias Clasen Date: Tue Jul 5 11:21:40 2011 -0400 2.29.10 configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)