From: DongHun Kwak Date: Wed, 4 Sep 2019 06:38:16 +0000 (+0900) Subject: Imported Upstream version 2.33.1 X-Git-Tag: upstream/2.33.1^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c04e1cad734c0135da9464d884eba28e7b87b2cf;p=platform%2Fupstream%2Fglibmm.git Imported Upstream version 2.33.1 --- diff --git a/.gitignore b/.gitignore index 28f463e..ef2bba1 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,9 @@ giommconfig.h # examples/ /examples/child_watch/child_watch /examples/compose/example -/examples/dbus/client_bus_listnames -/examples/dbus/server_without_bus -/examples/dbus/session_bus_service +/examples/dbus/busserver +/examples/dbus/peer +/examples/dbus/userbus /examples/iochannel_stream/example /examples/keyfile/example /examples/markup/parser @@ -128,8 +128,6 @@ giommconfig.h /glib/glibmm/spawn.h /glib/glibmm/thread.cc /glib/glibmm/thread.h -/glib/glibmm/threads.cc -/glib/glibmm/threads.h /glib/glibmm/timezone.cc /glib/glibmm/timezone.h /glib/glibmm/unicode.cc diff --git a/ChangeLog b/ChangeLog index 26eafc2..15b8b77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,37 +1,4 @@ -2.32.1: - -2012-07-10 Krzesimir Nowak - - Glib::Checksum: Fix a typo. - - * glib/src/checksum.hg: Should be *_SHOULD_*, not *_SHOUD_*. - -2012-07-01 Kjell Ahlstedt - - Update .gitignore. - - * .gitignore: Add /glib/glibmm/threads.[h|cc]. - Update examples/dbus/*. - -2012-06-19 Murray Cumming - - gen_scripts: Correct some comments/documentation. - - * tools/gen_scripts/gio_generate_extra_defs.sh: - * tools/gen_scripts/glib_generate_extra_defs.sh: - These do not need JHBUILD_SOURCES to be defined. - -2012-06-13 Murray Cumming - - Simplify the gen_scripts slightly. - - * tools/gen_scripts/gio_generate_docs.sh: - * tools/gen_scripts/gio_generate_enums.sh: - * tools/gen_scripts/gio_generate_methods.sh: - * tools/gen_scripts/glib_generate_docs.sh: - * tools/gen_scripts/glib_generate_enums.sh: - * tools/gen_scripts/glib_generate_methods.sh: - Do not require changes to PATH. +2.33.1 (unstable): 2012-06-08 Michał Wróbel @@ -60,6 +27,25 @@ * gio/src/application.ccg: It is annoying that GApplication (and other C code) distinguishes, of course. +2012-05-27 Murray Cumming + + Gio::Application: Allow the application ID to be empty. + + * configure.ac: Depend on the latest unstable glib release (2.33.1). + * gio/src/application.hg: constructor, create(): Add a default + (empty string) parameter for the application ID, because this may + now be empty if you do not need the full GApplication functionality. + +2012-04-21 Kalev Lember + + Gio: Start wrapping GResource. + + * gio/src/resource.[hg|ccg]: Add Gio::ResourceError so that the + resource handling functions in gtkmm could use it. The rest of the + GResource API is unwrapped. + * gio/src/filelist.am: List new resource.hg file. + Bug #674545. + 2012-04-17 Krzesimir Nowak Miscutils: Fix typos. diff --git a/NEWS b/NEWS index ef95758..56c2f81 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,12 @@ -2.32.1 (stable): +2.33.1 (unstable): Gio: * Application: + - Allow the application ID to be empty. - Pass 0 (NULL) rather than "" to GApplication. (Murray Cumming) +* Add Resource + Bug #674545 (Kalev Lember) Glib: * Miscutils: get_system_data_dirs(), get_system_config_dirs(): @@ -12,11 +15,8 @@ Glib: * Thread::RecMutex: Don't initialize this as a GStaticMutex. (Deprecated anyway) (Michał Wróbel) Bug #677291 -* Documentation: - - Don't hide add_exception_handler() documentation. +* Documentation: Don't hide add_exception_handler() documentation. (Kjell Ahlstedt) - - Really hide the GCheckSum type from the documentation. - (Krzesimir Nowak) 2.32.0 (stable): diff --git a/configure.ac b/configure.ac index 359277f..5e27956 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU Lesser General Public License ## along with this library. If not, see . -AC_INIT([glibmm], [2.32.1], +AC_INIT([glibmm], [2.33.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm], [glibmm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) @@ -60,7 +60,7 @@ AS_IF([test "x$enable_static" = xyes], AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library]) ]) -glibreq='2.0 >= 2.32.0' +glibreq='2.0 >= 2.33.1' GLIBMM_MODULES="sigc++-2.0 >= 2.2.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq" GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq" diff --git a/gio/src/application.hg b/gio/src/application.hg index edaf38f..70db6b6 100644 --- a/gio/src/application.hg +++ b/gio/src/application.hg @@ -90,11 +90,23 @@ class Application : public Glib::Object, public ActionGroup, public ActionMap _IMPLEMENTS_INTERFACE(ActionMap) protected: - explicit Application(const Glib::ustring& application_id, ApplicationFlags flags = APPLICATION_FLAGS_NONE); + /** Constructs an application instance. + * If no application ID is given then some features (most notably application uniqueness) will be disabled. + * + * @aparam application_id The application ID. + * @param flags The application flags. + */ + explicit Application(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags = APPLICATION_FLAGS_NONE); _IGNORE(g_application_new) public: - _WRAP_CREATE(const Glib::ustring& application_id, ApplicationFlags flags = APPLICATION_FLAGS_NONE) + /** Creates an application instance. + * If no application ID is given then some features (most notably application uniqueness) will be disabled. + * + * @aparam application_id The application ID. + * @param flags The application flags. + */ + _WRAP_CREATE(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags = APPLICATION_FLAGS_NONE) _WRAP_METHOD(static bool id_is_valid(const Glib::ustring& application_id), g_application_id_is_valid) diff --git a/gio/src/filelist.am b/gio/src/filelist.am index 7cd36b7..33a674d 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -89,6 +89,7 @@ giomm_files_any_hg = \ proxyresolver.hg \ remoteactiongroup.hg \ resolver.hg \ + resource.hg \ seekable.hg \ settings.hg \ simpleaction.hg \ diff --git a/gio/src/resource.ccg b/gio/src/resource.ccg new file mode 100644 index 0000000..b80d676 --- /dev/null +++ b/gio/src/resource.ccg @@ -0,0 +1,25 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*- + +/* Copyright (C) 2012 The giomm Development Team + * + * This library is free software; you can redistribute it 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, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gio +{ + +} // namespace Gio diff --git a/gio/src/resource.hg b/gio/src/resource.hg new file mode 100644 index 0000000..ad1ddd9 --- /dev/null +++ b/gio/src/resource.hg @@ -0,0 +1,31 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*- + +/* Copyright (C) 2012 The gtkmm Development Team + * + * This library is free software; you can redistribute it 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, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +_DEFS(giomm,gio) + +namespace Gio +{ + +/** Exception class for resource file handling errors. + */ +_WRAP_GERROR(ResourceError, GResourceError, G_RESOURCE_ERROR, NO_GTYPE) + +} // namespace Gio diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg index fce9309..e9f599f 100644 --- a/glib/src/checksum.hg +++ b/glib/src/checksum.hg @@ -22,7 +22,7 @@ _DEFS(glibmm,glib) #include #include -#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef DOXYGEN_SHOUD_SKIP_THIS extern "C" { typedef struct _GChecksum GChecksum; } #endif diff --git a/tools/gen_scripts/gio_generate_docs.sh b/tools/gen_scripts/gio_generate_docs.sh index edad682..190163a 100755 --- a/tools/gen_scripts/gio_generate_docs.sh +++ b/tools/gen_scripts/gio_generate_docs.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Note that +# Note that docextract_to_xml.py should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the -# jhbuild sources. The XML files will be placed in glib/src. +# jhbuild sources. The script assumes that it resides in the tools/gen_scripts +# directory and the XML file will be placed in gio/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then + echo -e "JHBUILD_SOURCES must contain path to jhbuild sources and \ +docextract_to_xml.py\nneeds to be executable and in PATH." exit 1; fi @@ -17,5 +19,4 @@ for dir in "$PREFIX"/glib/gio; do PARAMS="$PARAMS -s $dir" done -DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py" -$DOCEXTRACT_TO_XML_PY $PARAMS > "$OUT_DIR"/gio_docs.xml +docextract_to_xml.py $PARAMS > "$OUT_DIR"/gio_docs.xml diff --git a/tools/gen_scripts/gio_generate_enums.sh b/tools/gen_scripts/gio_generate_enums.sh index dd6d2a4..d8c6f6d 100755 --- a/tools/gen_scripts/gio_generate_enums.sh +++ b/tools/gen_scripts/gio_generate_enums.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Note that +# Note that enum.pl should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the -# jhbuild sources. The defs files will be placed in glib/src. +# jhbuild sources. The script assumes that it resides in the tools/gen_scripts +# directory and the defs files will be placed in gio/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which enum.pl`" ]; then + echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \ +enum.pl\nneeds to be executable and in PATH." exit 1; fi @@ -13,6 +15,5 @@ PREFIX="$JHBUILD_SOURCES/glib" ROOT_DIR="$(dirname "$0")/../.." OUT_DIR="$ROOT_DIR/gio/src" -ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl" -$ENUM_PL "$PREFIX"/gio/*.h > "$OUT_DIR"/gio_enums.defs +enum.pl "$PREFIX"/gio/*.h > "$OUT_DIR"/gio_enums.defs patch "$OUT_DIR"/gio_enums.defs "$OUT_DIR"/gio_enums.defs.patch diff --git a/tools/gen_scripts/gio_generate_extra_defs.sh b/tools/gen_scripts/gio_generate_extra_defs.sh index b6b77e2..b57683b 100755 --- a/tools/gen_scripts/gio_generate_extra_defs.sh +++ b/tools/gen_scripts/gio_generate_extra_defs.sh @@ -1,6 +1,7 @@ #!/bin/bash -# This script assumes that it resides in the +# Note that JHBUILD_SOURCES should be defined to contain the path to the root +# of the jhbuild sources. The script assumes that it resides in the # tools/gen_scripts directory and the defs files will be placed in gio/src. ROOT_DIR="$(dirname "$0")/../.." diff --git a/tools/gen_scripts/gio_generate_methods.sh b/tools/gen_scripts/gio_generate_methods.sh index 711c9c5..29add54 100755 --- a/tools/gen_scripts/gio_generate_methods.sh +++ b/tools/gen_scripts/gio_generate_methods.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Note that +# Note that h2def.py should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the -# jhbuild sources. The defs files will be placed in glib/src. +# jhbuild sources. The script assumes that it resides in the tools/gen_scripts +# directory and the defs files will be placed in gio/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which h2def.py`" ]; then + echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \ +h2def.py\nneeds to be executable and in PATH." exit 1; fi @@ -13,6 +15,5 @@ PREFIX="$JHBUILD_SOURCES/glib" ROOT_DIR="$(dirname "$0")/../.." OUT_DIR="$ROOT_DIR/gio/src" -H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py" -$H2DEF_PY "$PREFIX"/gio/*.h > "$OUT_DIR"/gio_methods.defs +h2def.py "$PREFIX"/gio/*.h > "$OUT_DIR"/gio_methods.defs #patch "$OUT_DIR"/gio_methods.defs "$OUT_DIR"/gio_methods.defs.patch diff --git a/tools/gen_scripts/glib_generate_docs.sh b/tools/gen_scripts/glib_generate_docs.sh index cb841cb..3f23190 100755 --- a/tools/gen_scripts/glib_generate_docs.sh +++ b/tools/gen_scripts/glib_generate_docs.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Note that +# Note that docextract_to_xml.py should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the -# jhbuild sources. The XML files will be placed in glib/src. +# jhbuild sources. The script assumes that it resides in the tools/gen_scripts +# directory and the XML file will be placed in glib/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then + echo -e "JHBUILD_SOURCES must contain path to jhbuild sources and \ +docextract_to_xml.py\nneeds to be executable and in PATH." exit 1; fi @@ -17,5 +19,4 @@ for dir in "$PREFIX"/glib/{glib,gmodule,gobject,gthread}; do PARAMS="$PARAMS -s $dir" done -DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py" -$DOCEXTRACT_TO_XML_PY $PARAMS > "$OUT_DIR/glib_docs.xml" +docextract_to_xml.py $PARAMS > "$OUT_DIR/glib_docs.xml" diff --git a/tools/gen_scripts/glib_generate_enums.sh b/tools/gen_scripts/glib_generate_enums.sh index c7bca21..9cd99ee 100755 --- a/tools/gen_scripts/glib_generate_enums.sh +++ b/tools/gen_scripts/glib_generate_enums.sh @@ -1,12 +1,13 @@ #!/bin/bash -# Note that +# Note that enum.pl should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the # jhbuild sources. The script assumes that it resides in the tools/gen_scripts # directory and the defs files will be placed in glib/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which enum.pl`" ]; then + echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \ +enum.pl\nneeds to be executable and in PATH." exit 1; fi @@ -14,9 +15,8 @@ PREFIX="$JHBUILD_SOURCES/glib" ROOT_DIR="$(dirname "$0")/../.." OUT_DIR="$ROOT_DIR/glib/src" -ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl" -$ENUM_PL "$PREFIX"/glib/*.h "$PREFIX"/glib/deprecated/*.h > "$OUT_DIR"/glib_enums.defs +enum.pl "$PREFIX"/glib/*.h "$PREFIX"/glib/deprecated/*.h > "$OUT_DIR"/glib_enums.defs patch "$OUT_DIR"/glib_enums.defs "$OUT_DIR"/glib_enums.defs.patch -$ENUM_PL "$PREFIX"/gmodule/*.h > "$OUT_DIR"/gmodule_enums.defs -$ENUM_PL "$PREFIX"/gobject/*.h > "$OUT_DIR"/gobject_enums.defs +enum.pl "$PREFIX"/gmodule/*.h > "$OUT_DIR"/gmodule_enums.defs +enum.pl "$PREFIX"/gobject/*.h > "$OUT_DIR"/gobject_enums.defs diff --git a/tools/gen_scripts/glib_generate_extra_defs.sh b/tools/gen_scripts/glib_generate_extra_defs.sh index 217d7e0..37296b0 100755 --- a/tools/gen_scripts/glib_generate_extra_defs.sh +++ b/tools/gen_scripts/glib_generate_extra_defs.sh @@ -1,6 +1,7 @@ #!/bin/bash -# This script assumes that it resides in the +# Note that JHBUILD_SOURCES should be defined to contain the path to the root +# of the jhbuild sources. The script assumes that it resides in the # tools/gen_scripts directory and the defs files will be placed in glib/src. ROOT_DIR="$(dirname "$0")/../.." diff --git a/tools/gen_scripts/glib_generate_methods.sh b/tools/gen_scripts/glib_generate_methods.sh index e585b45..32f2680 100755 --- a/tools/gen_scripts/glib_generate_methods.sh +++ b/tools/gen_scripts/glib_generate_methods.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Note that +# Note that h2def.py should be in PATH for this script to work and # JHBUILD_SOURCES should be defined to contain the path to the root of the -# jhbuild sources. The defs files will be placed in glib/src. +# jhbuild sources. The script assumes that it resides in the tools/gen_scripts +# directory and the defs files will be placed in glib/src. -if [ -z "$JHBUILD_SOURCES" ]; then - echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources." +if [ -z "$JHBUILD_SOURCES" -o ! -x "`which h2def.py`" ]; then + echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \ +h2def.py\nneeds to be executable and in PATH." exit 1; fi @@ -13,9 +15,8 @@ PREFIX="$JHBUILD_SOURCES/glib" ROOT_DIR="$(dirname "$0")/../.." OUT_DIR="$ROOT_DIR/glib/src" -H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py" -$H2DEF_PY "$PREFIX"/glib/*.h "$PREFIX"/glib/deprecated/*.h > "$OUT_DIR"/glib_functions.defs +h2def.py "$PREFIX"/glib/*.h "$PREFIX"/glib/deprecated/*.h > "$OUT_DIR"/glib_functions.defs patch "$OUT_DIR"/glib_functions.defs "$OUT_DIR"/glib_functions.defs.patch -$H2DEF_PY "$PREFIX"/gmodule/*.h > "$OUT_DIR"/gmodule_functions.defs -$H2DEF_PY "$PREFIX"/gobject/*.h > "$OUT_DIR"/gobject_functions.defs +h2def.py "$PREFIX"/gmodule/*.h > "$OUT_DIR"/gmodule_functions.defs +h2def.py "$PREFIX"/gobject/*.h > "$OUT_DIR"/gobject_functions.defs