diff -Nru d-conf-0.11.3/aclocal.m4 d-conf-0.11.5/aclocal.m4 --- d-conf-0.11.3/aclocal.m4 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/aclocal.m4 2012-02-06 19:33:19.000000000 +0000 @@ -19,6 +19,166 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU 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 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1006,166 +1166,6 @@ AC_MSG_ERROR([Vala $1 not found.])])])]) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU 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 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 -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - dnl GLIB_GSETTINGS dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether dnl the schema should be compiled @@ -1250,4 +1250,71 @@ ] ) -m4_include([m4/gtk-doc.m4]) +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) + diff -Nru d-conf-0.11.3/bin/dconf.c d-conf-0.11.5/bin/dconf.c --- d-conf-0.11.3/bin/dconf.c 2012-01-27 07:27:30.000000000 +0000 +++ d-conf-0.11.5/bin/dconf.c 2012-02-06 19:33:28.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf.c generated by valac 0.15.1, the Vala compiler +/* dconf.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf.vala, do not modify */ /* @@ -297,6 +297,8 @@ " reset Reset the value of a key or dir\n" \ " update Update the system databases\n" \ " watch Watch a path for changes\n" \ +" dump Dump an entire subpath to stdout\n" \ +" load Populate a subpath from stdin\n" \ "\n" \ "Use 'dconf help COMMAND' to get detailed help.\n" \ "\n"); diff -Nru d-conf-0.11.3/bin/dconf-dump.c d-conf-0.11.5/bin/dconf-dump.c --- d-conf-0.11.3/bin/dconf-dump.c 2012-01-27 07:27:30.000000000 +0000 +++ d-conf-0.11.5/bin/dconf-dump.c 2012-02-06 19:33:28.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-dump.c generated by valac 0.15.1, the Vala compiler +/* dconf-dump.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-dump.vala, do not modify */ diff -Nru d-conf-0.11.3/bin/dconf-update.c d-conf-0.11.5/bin/dconf-update.c --- d-conf-0.11.3/bin/dconf-update.c 2012-01-27 07:27:30.000000000 +0000 +++ d-conf-0.11.5/bin/dconf-update.c 2012-02-06 19:33:28.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-update.c generated by valac 0.15.1, the Vala compiler +/* dconf-update.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-update.vala, do not modify */ /* diff -Nru d-conf-0.11.3/bin/dconf.vala d-conf-0.11.5/bin/dconf.vala --- d-conf-0.11.3/bin/dconf.vala 2011-09-11 16:44:19.000000000 +0000 +++ d-conf-0.11.5/bin/dconf.vala 2012-02-06 19:11:30.000000000 +0000 @@ -93,6 +93,8 @@ reset Reset the value of a key or dir update Update the system databases watch Watch a path for changes + dump Dump an entire subpath to stdout + load Populate a subpath from stdin Use 'dconf help COMMAND' to get detailed help. diff -Nru d-conf-0.11.3/bin/Makefile.in d-conf-0.11.5/bin/Makefile.in --- d-conf-0.11.3/bin/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/bin/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -38,8 +38,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in dconf-dump.c \ dconf-update.c dconf.c dconf_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/client/dconf-client.c d-conf-0.11.5/client/dconf-client.c --- d-conf-0.11.3/client/dconf-client.c 2012-01-19 19:36:32.000000000 +0000 +++ d-conf-0.11.5/client/dconf-client.c 2012-02-06 19:33:27.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-client.c generated by valac 0.14.1, the Vala compiler +/* dconf-client.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-client.vala, do not modify */ @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include "dconf-engine.h" +#include "dconf.h" #define DCONF_TYPE_CLIENT (dconf_client_get_type ()) @@ -24,8 +24,8 @@ #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _dconf_engine_free0(var) ((var == NULL) ? NULL : (var = (dconf_engine_free (var), NULL))) #define _g_variant_iter_free0(var) ((var == NULL) ? NULL : (var = (g_variant_iter_free (var), NULL))) -#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) typedef struct _DconfClientCallAsyncData DconfClientCallAsyncData; typedef struct _DconfClientWriteAsyncData DconfClientWriteAsyncData; typedef struct _DconfClientWatchAsyncData DconfClientWatchAsyncData; @@ -375,6 +375,8 @@ GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (dcem != NULL); + _g_free0 (_vala_tag); + _vala_tag = NULL; _tmp0_ = *dcem; _tmp1_ = _tmp0_.bus_types; _tmp1__length1 = _tmp0_.n_messages; @@ -604,6 +606,8 @@ g_assert_not_reached (); } _state_0: + _g_free0 (_data_->tag); + _data_->tag = NULL; _data_->_tmp0_ = _data_->dcem; _data_->_tmp1_ = _data_->_tmp0_.bus_types; _data_->_tmp1__length1 = _data_->_tmp0_.n_messages; @@ -682,7 +686,6 @@ _data_->_message_collection_size_ = 0; _data_->message_collection = _data_->_tmp19_; _data_->message_collection_length1 = _data_->_tmp19__length1; - _data_->message_it = 0; for (_data_->message_it = 0; _data_->message_it < _data_->_tmp19__length1; _data_->message_it = _data_->message_it + 1) { _data_->_tmp20_ = _g_variant_ref0 (_data_->message_collection[_data_->message_it]); _data_->message = _data_->_tmp20_; @@ -791,69 +794,35 @@ gboolean dconf_client_write (DConfClient* self, const gchar* key, GVariant* value, gchar** tag, GCancellable* cancellable, GError** error) { gchar* _vala_tag = NULL; gboolean result = FALSE; + DConfEngine* _tmp0_; + const gchar* _tmp1_; + GVariant* _tmp2_; + DConfEngineMessage _tmp3_ = {0}; + DConfEngineMessage _tmp4_; + DConfEngineMessage _tmp5_; + GCancellable* _tmp6_; + gchar* _tmp7_ = NULL; GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); - if ((&_vala_tag) == NULL) { - gchar* junk = NULL; - DConfEngine* _tmp0_; - const gchar* _tmp1_; - GVariant* _tmp2_; - DConfEngineMessage _tmp3_ = {0}; - DConfEngineMessage _tmp4_; - DConfEngineMessage _tmp5_; - GCancellable* _tmp6_; - gchar* _tmp7_ = NULL; - _tmp0_ = self->priv->engine; - _tmp1_ = key; - _tmp2_ = value; - dconf_engine_write (_tmp0_, _tmp1_, _tmp2_, &_tmp3_, &_inner_error_); - _tmp4_ = _tmp3_; - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - _g_free0 (junk); - return FALSE; - } - _tmp5_ = _tmp4_; - _tmp6_ = cancellable; - dconf_client_call_sync (self, &_tmp5_, &_tmp7_, _tmp6_, &_inner_error_); - _g_free0 (junk); - junk = _tmp7_; - dconf_engine_message_destroy (&_tmp5_); - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - _g_free0 (junk); - return FALSE; - } - _g_free0 (junk); - } else { - DConfEngine* _tmp8_; - const gchar* _tmp9_; - GVariant* _tmp10_; - DConfEngineMessage _tmp11_ = {0}; - DConfEngineMessage _tmp12_; - DConfEngineMessage _tmp13_; - GCancellable* _tmp14_; - gchar* _tmp15_ = NULL; - _tmp8_ = self->priv->engine; - _tmp9_ = key; - _tmp10_ = value; - dconf_engine_write (_tmp8_, _tmp9_, _tmp10_, &_tmp11_, &_inner_error_); - _tmp12_ = _tmp11_; - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - return FALSE; - } - _tmp13_ = _tmp12_; - _tmp14_ = cancellable; - dconf_client_call_sync (self, &_tmp13_, &_tmp15_, _tmp14_, &_inner_error_); - _g_free0 (_vala_tag); - _vala_tag = _tmp15_; - dconf_engine_message_destroy (&_tmp13_); - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - return FALSE; - } + _tmp0_ = self->priv->engine; + _tmp1_ = key; + _tmp2_ = value; + dconf_engine_write (_tmp0_, _tmp1_, _tmp2_, &_tmp3_, &_inner_error_); + _tmp4_ = _tmp3_; + if (_inner_error_ != NULL) { + g_propagate_error (error, _inner_error_); + return FALSE; + } + _tmp5_ = _tmp4_; + _tmp6_ = cancellable; + dconf_client_call_sync (self, &_tmp5_, &_tmp7_, _tmp6_, &_inner_error_); + _g_free0 (_vala_tag); + _vala_tag = _tmp7_; + dconf_engine_message_destroy (&_tmp5_); + if (_inner_error_ != NULL) { + g_propagate_error (error, _inner_error_); + return FALSE; } result = TRUE; if (tag) { @@ -1035,81 +1004,41 @@ gboolean dconf_client_write_many (DConfClient* self, const gchar* dir, gchar** rels, GVariant** values, int values_length1, gchar** tag, GCancellable* cancellable, GError** error) { gchar* _vala_tag = NULL; gboolean result = FALSE; + DConfEngine* _tmp0_; + const gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + GVariant** _tmp3_; + gint _tmp3__length1; + DConfEngineMessage _tmp4_ = {0}; + DConfEngineMessage _tmp5_; + DConfEngineMessage _tmp6_; + GCancellable* _tmp7_; + gchar* _tmp8_ = NULL; GError * _inner_error_ = NULL; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (dir != NULL, FALSE); - if ((&_vala_tag) == NULL) { - gchar* junk = NULL; - DConfEngine* _tmp0_; - const gchar* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - GVariant** _tmp3_; - gint _tmp3__length1; - DConfEngineMessage _tmp4_ = {0}; - DConfEngineMessage _tmp5_; - DConfEngineMessage _tmp6_; - GCancellable* _tmp7_; - gchar* _tmp8_ = NULL; - _tmp0_ = self->priv->engine; - _tmp1_ = dir; - _tmp2_ = rels; - _tmp2__length1 = _vala_array_length (rels); - _tmp3_ = values; - _tmp3__length1 = values_length1; - dconf_engine_write_many (_tmp0_, _tmp1_, (const gchar * const *) _tmp2_, _tmp3_, &_tmp4_, &_inner_error_); - _tmp5_ = _tmp4_; - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - _g_free0 (junk); - return FALSE; - } - _tmp6_ = _tmp5_; - _tmp7_ = cancellable; - dconf_client_call_sync (self, &_tmp6_, &_tmp8_, _tmp7_, &_inner_error_); - _g_free0 (junk); - junk = _tmp8_; - dconf_engine_message_destroy (&_tmp6_); - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - _g_free0 (junk); - return FALSE; - } - _g_free0 (junk); - } else { - DConfEngine* _tmp9_; - const gchar* _tmp10_; - gchar** _tmp11_; - gint _tmp11__length1; - GVariant** _tmp12_; - gint _tmp12__length1; - DConfEngineMessage _tmp13_ = {0}; - DConfEngineMessage _tmp14_; - DConfEngineMessage _tmp15_; - GCancellable* _tmp16_; - gchar* _tmp17_ = NULL; - _tmp9_ = self->priv->engine; - _tmp10_ = dir; - _tmp11_ = rels; - _tmp11__length1 = _vala_array_length (rels); - _tmp12_ = values; - _tmp12__length1 = values_length1; - dconf_engine_write_many (_tmp9_, _tmp10_, (const gchar * const *) _tmp11_, _tmp12_, &_tmp13_, &_inner_error_); - _tmp14_ = _tmp13_; - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - return FALSE; - } - _tmp15_ = _tmp14_; - _tmp16_ = cancellable; - dconf_client_call_sync (self, &_tmp15_, &_tmp17_, _tmp16_, &_inner_error_); - _g_free0 (_vala_tag); - _vala_tag = _tmp17_; - dconf_engine_message_destroy (&_tmp15_); - if (_inner_error_ != NULL) { - g_propagate_error (error, _inner_error_); - return FALSE; - } + _tmp0_ = self->priv->engine; + _tmp1_ = dir; + _tmp2_ = rels; + _tmp2__length1 = _vala_array_length (rels); + _tmp3_ = values; + _tmp3__length1 = values_length1; + dconf_engine_write_many (_tmp0_, _tmp1_, (const gchar * const *) _tmp2_, _tmp3_, &_tmp4_, &_inner_error_); + _tmp5_ = _tmp4_; + if (_inner_error_ != NULL) { + g_propagate_error (error, _inner_error_); + return FALSE; + } + _tmp6_ = _tmp5_; + _tmp7_ = cancellable; + dconf_client_call_sync (self, &_tmp6_, &_tmp8_, _tmp7_, &_inner_error_); + _g_free0 (_vala_tag); + _vala_tag = _tmp8_; + dconf_engine_message_destroy (&_tmp6_); + if (_inner_error_ != NULL) { + g_propagate_error (error, _inner_error_); + return FALSE; } result = TRUE; if (tag) { @@ -1221,7 +1150,7 @@ g_return_val_if_fail (dir != NULL, NULL); _tmp0_ = self->priv->engine; _tmp1_ = dir; - _tmp3_ = dconf_engine_list (_tmp0_, _tmp1_, NULL, &_tmp2_); + _tmp3_ = dconf_engine_list (_tmp0_, _tmp1_, &_tmp2_); _tmp4_ = _tmp3_; _tmp4__length1 = _tmp2_; if (result_length1) { @@ -1573,6 +1502,7 @@ DConfEngine* _tmp1_; DConfWatchFunc _tmp2_; void* _tmp2__target; + GDestroyNotify _tmp2__target_destroy_notify; self = (DConfClient*) g_object_new (object_type, NULL); _tmp0_ = profile; _tmp1_ = dconf_engine_new (_tmp0_); @@ -1580,13 +1510,15 @@ self->priv->engine = _tmp1_; _tmp2_ = watch_func; _tmp2__target = watch_func_target; + _tmp2__target_destroy_notify = watch_func_target_destroy_notify; + watch_func_target_destroy_notify = NULL; (self->priv->watch_func_target_destroy_notify == NULL) ? NULL : (self->priv->watch_func_target_destroy_notify (self->priv->watch_func_target), NULL); self->priv->watch_func = NULL; self->priv->watch_func_target = NULL; self->priv->watch_func_target_destroy_notify = NULL; self->priv->watch_func = _tmp2_; self->priv->watch_func_target = _tmp2__target; - self->priv->watch_func_target_destroy_notify = NULL; + self->priv->watch_func_target_destroy_notify = _tmp2__target_destroy_notify; (watch_func_target_destroy_notify == NULL) ? NULL : (watch_func_target_destroy_notify (watch_func_target), NULL); watch_func = NULL; watch_func_target = NULL; diff -Nru d-conf-0.11.3/client/dconf-client.vala d-conf-0.11.5/client/dconf-client.vala --- d-conf-0.11.3/client/dconf-client.vala 2011-09-11 19:09:37.000000000 +0000 +++ d-conf-0.11.5/client/dconf-client.vala 2012-02-05 20:50:52.000000000 +0000 @@ -35,6 +35,8 @@ void call_sync (EngineMessage dcem, out string tag, Cancellable? cancellable) throws Error { DBusConnection connection; + tag = null; + if (dcem.bus_types[0] == 'e') { if (session == null) { session = Bus.get_sync (BusType.SESSION, cancellable); @@ -66,6 +68,8 @@ async void call_async (EngineMessage dcem, out string tag, Cancellable? cancellable) throws Error { DBusConnection connection; + tag = null; + if (dcem.bus_types[0] == 'e') { if (session == null) { session = yield Bus.get (BusType.SESSION, cancellable); @@ -123,12 +127,7 @@ * tag that appears in change notifications. **/ public bool write (string key, Variant? value, out string tag = null, Cancellable? cancellable = null) throws Error { - if (&tag == null) { /* bgo #591673 */ - string junk; - call_sync (engine.write (key, value), out junk, cancellable); - } else { - call_sync (engine.write (key, value), out tag, cancellable); - } + call_sync (engine.write (key, value), out tag, cancellable); return true; } @@ -173,12 +172,7 @@ * tag that appears in change notifications. **/ public bool write_many (string dir, [CCode (array_length = false, array_null_terminated = true)] string[] rels, Variant?[] values, out string? tag = null, Cancellable? cancellable = null) throws Error { - if (&tag == null) { /* bgo #591673 */ - string junk; - call_sync (engine.write_many (dir, rels, values), out junk, cancellable); - } else { - call_sync (engine.write_many (dir, rels, values), out tag, cancellable); - } + call_sync (engine.write_many (dir, rels, values), out tag, cancellable); return true; } @@ -359,7 +353,7 @@ **/ public Client (string? profile = null, owned WatchFunc? watch_func = null) { engine = new Engine (profile); - this.watch_func = watch_func; + this.watch_func = (owned) watch_func; } } diff -Nru d-conf-0.11.3/client/dconf.vapi d-conf-0.11.5/client/dconf.vapi --- d-conf-0.11.3/client/dconf.vapi 2012-01-19 19:36:32.000000000 +0000 +++ d-conf-0.11.5/client/dconf.vapi 2012-02-06 19:33:27.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf.vapi generated by valac 0.14.1, do not modify. */ +/* dconf.vapi generated by valac 0.15.1.20-908e, do not modify. */ namespace DConf { [CCode (cheader_filename = "dconf.h")] diff -Nru d-conf-0.11.3/client/engine.vapi d-conf-0.11.5/client/engine.vapi --- d-conf-0.11.3/client/engine.vapi 2011-09-11 19:09:48.000000000 +0000 +++ d-conf-0.11.5/client/engine.vapi 2012-02-05 20:46:23.000000000 +0000 @@ -10,7 +10,7 @@ internal GLib.Variant? read_default (string key); internal GLib.Variant? read_no_default (string key); internal EngineMessage set_locked (string key, bool locked); - internal string[] list (string dir, void*junk = null); + internal string[] list (string dir); internal EngineMessage watch (string name); internal EngineMessage unwatch (string name); } diff -Nru d-conf-0.11.3/client/Makefile.in d-conf-0.11.5/client/Makefile.in --- d-conf-0.11.3/client/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/client/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -40,8 +40,7 @@ $(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \ libdconf_so_0_0_0_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/common/Makefile.in d-conf-0.11.5/common/Makefile.in --- d-conf-0.11.3/common/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/common/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -36,8 +36,7 @@ DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/configure d-conf-0.11.5/configure --- d-conf-0.11.3/configure 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/configure 2012-02-06 19:33:21.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for dconf 0.11.3. +# Generated by GNU Autoconf 2.68 for dconf 0.11.5. # # Report bugs to . # @@ -620,8 +620,8 @@ # Identity of this package. PACKAGE_NAME='dconf' PACKAGE_TARNAME='dconf' -PACKAGE_VERSION='0.11.3' -PACKAGE_STRING='dconf 0.11.3' +PACKAGE_VERSION='0.11.5' +PACKAGE_STRING='dconf 0.11.5' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=dconf' PACKAGE_URL='' @@ -1334,7 +1334,7 @@ # 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 dconf 0.11.3 to adapt to many kinds of systems. +\`configure' configures dconf 0.11.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1400,7 +1400,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dconf 0.11.3:";; + short | recursive ) echo "Configuration of dconf 0.11.5:";; esac cat <<\_ACEOF @@ -1526,7 +1526,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dconf configure 0.11.3 +dconf configure 0.11.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1581,7 +1581,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dconf $as_me 0.11.3, which was +It was created by dconf $as_me 0.11.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2402,7 +2402,7 @@ # Define the identity of the package. PACKAGE='dconf' - VERSION='0.11.3' + VERSION='0.11.5' cat >>confdefs.h <<_ACEOF @@ -5261,7 +5261,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dconf $as_me 0.11.3, which was +This file was extended by dconf $as_me 0.11.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5327,7 +5327,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dconf config.status 0.11.3 +dconf config.status 0.11.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru d-conf-0.11.3/configure.ac d-conf-0.11.5/configure.ac --- d-conf-0.11.3/configure.ac 2012-01-27 17:24:59.000000000 +0000 +++ d-conf-0.11.5/configure.ac 2012-02-06 19:32:28.000000000 +0000 @@ -1,5 +1,5 @@ AC_INIT([dconf], - [0.11.3], + [0.11.5], [https://bugzilla.gnome.org/enter_bug.cgi?product=dconf], [dconf]) diff -Nru d-conf-0.11.3/dbus-1/Makefile.in d-conf-0.11.5/dbus-1/Makefile.in --- d-conf-0.11.3/dbus-1/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/dbus-1/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -39,8 +39,7 @@ DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/debian/changelog d-conf-0.11.5/debian/changelog --- d-conf-0.11.3/debian/changelog 2012-01-27 18:07:46.000000000 +0000 +++ d-conf-0.11.5/debian/changelog 2012-02-07 12:41:34.000000000 +0000 @@ -1,3 +1,9 @@ +d-conf (0.11.5-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Didier Roche Tue, 07 Feb 2012 13:41:34 +0100 + d-conf (0.11.3-0ubuntu1) precise; urgency=low * New upstream release diff -Nru d-conf-0.11.3/docs/html/ch01.html d-conf-0.11.5/docs/html/ch01.html --- d-conf-0.11.3/docs/html/ch01.html 2012-01-27 17:25:04.000000000 +0000 +++ d-conf-0.11.5/docs/html/ch01.html 2012-02-06 19:37:54.000000000 +0000 @@ -21,7 +21,7 @@

-DConf Client API

+DConf Client API
DConf Paths — utility functions to validate dconf paths diff -Nru d-conf-0.11.3/docs/html/DConfClient.html d-conf-0.11.5/docs/html/DConfClient.html --- d-conf-0.11.3/docs/html/DConfClient.html 2012-01-27 17:25:04.000000000 +0000 +++ d-conf-0.11.5/docs/html/DConfClient.html 2012-02-06 19:37:54.000000000 +0000 @@ -217,7 +217,7 @@

profile :

-the dconf profile to use, or NULL +the dconf profile to use, or NULL @@ -237,7 +237,7 @@

Returns :

a new DConfClient Creates a new DConfClient for the given context. -If profile is non-NULL then it specifies the name of the profile to use. If profile is NULL then +If profile is non-NULL then it specifies the name of the profile to use. If profile is NULL then the DCONF_PROFILE environment variable is consulted. If that is unset then the default profile of "user" is used. If a profile named "user" is not installed then the dconf client is setup to access ~/.config/dconf/user. @@ -264,8 +264,8 @@

Returns :

-the value corresponding to key, or NULL if there is none -Reads the value named by key from dconf. If no such value exists, NULL is returned. +the value corresponding to key, or NULL if there is none +Reads the value named by key from dconf. If no such value exists, NULL is returned.
@@ -289,7 +289,7 @@

Returns :

-the default value corresponding to key, or NULL if there is none +the default value corresponding to key, or NULL if there is none Reads the value named by key from any existing default/mandatory databases but ignoring any value set by the user. The result is as if the named key had just been reset. @@ -315,7 +315,7 @@

Returns :

-the user value corresponding to key, or NULL if there is none +the user value corresponding to key, or NULL if there is none Reads the value named by key as set by the user, ignoring any default/mandatory databases. Normal applications will never want to do this, but it may be useful for administrative or configuration tweaking utilities to have access to this information. @@ -411,7 +411,7 @@

value :

-a GVariant, or NULL. [allow-none] +a GVariant, or NULL. [allow-none] @@ -421,12 +421,12 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL

error :

-a pointer to a GError, or NULL +a pointer to a GError, or NULL @@ -434,9 +434,9 @@ TRUE if the write is successful Write a value to the given key, or reset key to its default value. -If value is NULL then key is reset to its default value (which may +If value is NULL then key is reset to its default value (which may be completely unset), otherwise value becomes the new value. -If tag is non-NULL then it is set to the unique tag associated with this write. This is the same +If tag is non-NULL then it is set to the unique tag associated with this write. This is the same tag that appears in change notifications. @@ -472,12 +472,12 @@

value :

-a GVariant, or NULL. [allow-none] +a GVariant, or NULL. [allow-none]

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL @@ -522,7 +522,7 @@

error :

-a pointer to a GError, or NULL +a pointer to a GError, or NULL @@ -553,11 +553,11 @@

rels :

-a NULL-terminated array of relative keys +a NULL-terminated array of relative keys

values :

-an array of possibly-NULL GVariant pointers +an array of possibly-NULL GVariant pointers

n_values :

@@ -571,12 +571,12 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL

error :

-a pointer to a GError, or NULL +a pointer to a GError, or NULL @@ -585,9 +585,9 @@ TRUE if the write is successful Write multiple values at once. For each pair of items from rels and values, the value is written to the result of concatenating -dir with the relative path. As with dconf_client_write(), if a given value is NULL then the effect +dir with the relative path. As with dconf_client_write(), if a given value is NULL then the effect is that the specified key is reset. -If tag is non-NULL then it is set to the unique tag associated with this write. This is the same +If tag is non-NULL then it is set to the unique tag associated with this write. This is the same tag that appears in change notifications. @@ -614,12 +614,12 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL

error :

-a pointer to a NULL GError, or NULL +a pointer to a NULL GError, or NULL @@ -664,7 +664,7 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL @@ -703,7 +703,7 @@

error :

-a pointer to a GError, or NULL +a pointer to a GError, or NULL @@ -730,12 +730,12 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL

error :

-a pointer to a NULL GError, or NULL +a pointer to a NULL GError, or NULL @@ -782,7 +782,7 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL @@ -822,7 +822,7 @@

error :

-a pointer to a GError, or NULL +a pointer to a GError, or NULL diff -Nru d-conf-0.11.3/docs/html/dconf-DConf-Paths.html d-conf-0.11.5/docs/html/dconf-DConf-Paths.html --- d-conf-0.11.3/docs/html/dconf-DConf-Paths.html 2012-01-27 17:25:04.000000000 +0000 +++ d-conf-0.11.5/docs/html/dconf-DConf-Paths.html 2012-02-06 19:37:54.000000000 +0000 @@ -79,7 +79,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

@@ -111,7 +111,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

@@ -142,7 +142,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

@@ -170,7 +170,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

@@ -199,7 +199,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

@@ -232,7 +232,7 @@

error :

-a pointer to a GError, or NULL, set when FALSE is returned +a pointer to a GError, or NULL, set when FALSE is returned

Returns :

diff -Nru d-conf-0.11.3/docs/Makefile.in d-conf-0.11.5/docs/Makefile.in --- d-conf-0.11.3/docs/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/docs/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -41,8 +41,7 @@ $(srcdir)/gtk-doc.make subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/editor/dconf-editor.c d-conf-0.11.5/editor/dconf-editor.c --- d-conf-0.11.3/editor/dconf-editor.c 2012-01-27 07:27:31.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-editor.c 2012-02-06 19:33:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-editor.c generated by valac 0.15.1, the Vala compiler +/* dconf-editor.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-editor.vala, do not modify */ diff -Nru d-conf-0.11.3/editor/dconf-model.c d-conf-0.11.5/editor/dconf-model.c --- d-conf-0.11.3/editor/dconf-model.c 2012-01-27 07:27:31.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-model.c 2012-02-06 19:33:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-model.c generated by valac 0.15.1, the Vala compiler +/* dconf-model.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-model.vala, do not modify */ @@ -2969,7 +2969,7 @@ _inner_error_ = NULL; _tmp3_ = e; _tmp4_ = _tmp3_->message; - g_warning ("dconf-model.vala:601: Failed to watch all keys: %s", _tmp4_); + g_warning ("dconf-model.vala:593: Failed to watch all keys: %s", _tmp4_); _g_error_free0 (e); } __finally3: @@ -3063,7 +3063,7 @@ _inner_error_ = NULL; _tmp23_ = e; _tmp24_ = _tmp23_->message; - g_warning ("dconf-model.vala:618: Failed to parse schemas: %s", _tmp24_); + g_warning ("dconf-model.vala:610: Failed to parse schemas: %s", _tmp24_); _g_error_free0 (e); } __finally4: diff -Nru d-conf-0.11.3/editor/dconf-model.vala d-conf-0.11.5/editor/dconf-model.vala --- d-conf-0.11.3/editor/dconf-model.vala 2011-10-31 23:18:00.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-model.vala 2012-02-06 19:23:21.000000000 +0000 @@ -349,11 +349,7 @@ return iter_nth_child(out iter, null, path.get_indices()[0]); } -#if VALA_0_14 public Gtk.TreePath? get_path(Gtk.TreeIter iter) -#else - public Gtk.TreePath get_path(Gtk.TreeIter iter) -#endif { var path = new Gtk.TreePath(); path.append_index(get_key(iter).index); @@ -491,11 +487,7 @@ return iter_nth_child(out iter, null, path.get_indices()[0]); } -#if VALA_0_14 public Gtk.TreePath? get_path(Gtk.TreeIter iter) -#else - public Gtk.TreePath get_path(Gtk.TreeIter iter) -#endif { var path = new Gtk.TreePath(); path.append_index((int)get_enum_value(iter).index); @@ -672,11 +664,7 @@ return true; } -#if VALA_0_14 public Gtk.TreePath? get_path(Gtk.TreeIter iter) -#else - public Gtk.TreePath get_path(Gtk.TreeIter iter) -#endif { var path = new Gtk.TreePath(); for (var d = get_directory(iter); d != root; d = d.parent) diff -Nru d-conf-0.11.3/editor/dconf-schema.c d-conf-0.11.5/editor/dconf-schema.c --- d-conf-0.11.3/editor/dconf-schema.c 2012-01-27 07:27:31.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-schema.c 2012-02-06 19:33:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-schema.c generated by valac 0.15.1, the Vala compiler +/* dconf-schema.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-schema.vala, do not modify */ @@ -705,7 +705,13 @@ const gchar* _tmp90_; gchar* value; const gchar* _tmp108_; - GVariant* v = NULL; + const gchar* _tmp109_; + GVariant* _tmp110_; + GVariant* _tmp111_; + GVariant* v; + const gchar* _tmp112_; + GVariant* _tmp113_; + SchemaChoice* _tmp114_; _tmp83_ = _tmp82_; if (!_tmp83_) { xmlNode* _tmp84_; @@ -792,224 +798,173 @@ _g_free0 (value); continue; } - { - const gchar* _tmp109_; - GVariant* _tmp110_; - GVariant* _tmp111_; - const gchar* _tmp112_; - GVariant* _tmp113_; - SchemaChoice* _tmp114_; - _tmp109_ = value; - _tmp110_ = g_variant_new_string (_tmp109_); - _tmp111_ = g_variant_ref_sink (_tmp110_); - _g_variant_unref0 (v); - v = _tmp111_; - _tmp112_ = value; - _tmp113_ = v; - _tmp114_ = schema_choice_new (_tmp112_, _tmp113_); - self->choices = g_list_append (self->choices, _tmp114_); - } - goto __finally6; - __catch6_g_variant_parse_error: - { - GError* e = NULL; - const gchar* _tmp115_; - e = _inner_error_; - _inner_error_ = NULL; - _tmp115_ = value; - g_warning ("dconf-schema.vala:95: Invalid choice value '%s'", _tmp115_); - _g_error_free0 (e); - } - __finally6: - if (_inner_error_ != NULL) { - _g_variant_unref0 (v); - _g_free0 (value); - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return NULL; - } + _tmp109_ = value; + _tmp110_ = g_variant_new_string (_tmp109_); + _tmp111_ = g_variant_ref_sink (_tmp110_); + v = _tmp111_; + _tmp112_ = value; + _tmp113_ = v; + _tmp114_ = schema_choice_new (_tmp112_, _tmp113_); + self->choices = g_list_append (self->choices, _tmp114_); _g_variant_unref0 (v); _g_free0 (value); } } } } else { - xmlNode* _tmp116_; - const gchar* _tmp117_; - _tmp116_ = child; - _tmp117_ = _tmp116_->name; - if (g_strcmp0 (_tmp117_, "aliases") == 0) { + xmlNode* _tmp115_; + const gchar* _tmp116_; + _tmp115_ = child; + _tmp116_ = _tmp115_->name; + if (g_strcmp0 (_tmp116_, "aliases") == 0) { { + xmlNode* _tmp117_; xmlNode* _tmp118_; - xmlNode* _tmp119_; xmlNode* n; - _tmp118_ = child; - _tmp119_ = _tmp118_->children; - n = _tmp119_; + _tmp117_ = child; + _tmp118_ = _tmp117_->children; + n = _tmp118_; { - gboolean _tmp120_; - _tmp120_ = TRUE; + gboolean _tmp119_; + _tmp119_ = TRUE; while (TRUE) { - gboolean _tmp121_; + gboolean _tmp120_; + xmlNode* _tmp123_; xmlNode* _tmp124_; - xmlNode* _tmp125_; - xmlElementType _tmp126_; - xmlNode* _tmp127_; - const gchar* _tmp128_; + xmlElementType _tmp125_; + xmlNode* _tmp126_; + const gchar* _tmp127_; gchar* value; gchar* target; + const gchar* _tmp151_; const gchar* _tmp152_; const gchar* _tmp153_; - GVariant* v = NULL; - _tmp121_ = _tmp120_; - if (!_tmp121_) { + GVariant* _tmp154_; + GVariant* _tmp155_; + GVariant* v; + const gchar* _tmp156_; + GVariant* _tmp157_; + SchemaChoice* _tmp158_; + _tmp120_ = _tmp119_; + if (!_tmp120_) { + xmlNode* _tmp121_; xmlNode* _tmp122_; - xmlNode* _tmp123_; - _tmp122_ = n; - _tmp123_ = _tmp122_->next; - n = _tmp123_; + _tmp121_ = n; + _tmp122_ = _tmp121_->next; + n = _tmp122_; } - _tmp120_ = FALSE; - _tmp124_ = n; - if (!(_tmp124_ != NULL)) { + _tmp119_ = FALSE; + _tmp123_ = n; + if (!(_tmp123_ != NULL)) { break; } - _tmp125_ = n; - _tmp126_ = _tmp125_->type; - if (_tmp126_ != XML_ELEMENT_NODE) { + _tmp124_ = n; + _tmp125_ = _tmp124_->type; + if (_tmp125_ != XML_ELEMENT_NODE) { continue; } - _tmp127_ = n; - _tmp128_ = _tmp127_->name; - if (g_strcmp0 (_tmp128_, "alias") != 0) { - xmlNode* _tmp129_; - const gchar* _tmp130_; - _tmp129_ = n; - _tmp130_ = _tmp129_->name; - g_warning ("dconf-schema.vala:107: Unknown child tag in , <%s>", _tmp130_); + _tmp126_ = n; + _tmp127_ = _tmp126_->name; + if (g_strcmp0 (_tmp127_, "alias") != 0) { + xmlNode* _tmp128_; + const gchar* _tmp129_; + _tmp128_ = n; + _tmp129_ = _tmp128_->name; + g_warning ("dconf-schema.vala:99: Unknown child tag in , <%s>", _tmp129_); continue; } value = NULL; target = NULL; { - xmlNode* _tmp131_; - xmlAttr* _tmp132_; + xmlNode* _tmp130_; + xmlAttr* _tmp131_; xmlAttr* prop; - _tmp131_ = n; - _tmp132_ = _tmp131_->properties; - prop = _tmp132_; + _tmp130_ = n; + _tmp131_ = _tmp130_->properties; + prop = _tmp131_; { - gboolean _tmp133_; - _tmp133_ = TRUE; + gboolean _tmp132_; + _tmp132_ = TRUE; while (TRUE) { - gboolean _tmp134_; + gboolean _tmp133_; + xmlAttr* _tmp136_; xmlAttr* _tmp137_; - xmlAttr* _tmp138_; - const gchar* _tmp139_; - _tmp134_ = _tmp133_; - if (!_tmp134_) { + const gchar* _tmp138_; + _tmp133_ = _tmp132_; + if (!_tmp133_) { + xmlAttr* _tmp134_; xmlAttr* _tmp135_; - xmlAttr* _tmp136_; - _tmp135_ = prop; - _tmp136_ = _tmp135_->next; - prop = _tmp136_; + _tmp134_ = prop; + _tmp135_ = _tmp134_->next; + prop = _tmp135_; } - _tmp133_ = FALSE; - _tmp137_ = prop; - if (!(_tmp137_ != NULL)) { + _tmp132_ = FALSE; + _tmp136_ = prop; + if (!(_tmp136_ != NULL)) { break; } - _tmp138_ = prop; - _tmp139_ = _tmp138_->name; - if (g_strcmp0 (_tmp139_, "value") == 0) { - xmlAttr* _tmp140_; - xmlNode* _tmp141_; - const gchar* _tmp142_; - gchar* _tmp143_; - _tmp140_ = prop; - _tmp141_ = _tmp140_->children; - _tmp142_ = _tmp141_->content; - _tmp143_ = g_strdup (_tmp142_); + _tmp137_ = prop; + _tmp138_ = _tmp137_->name; + if (g_strcmp0 (_tmp138_, "value") == 0) { + xmlAttr* _tmp139_; + xmlNode* _tmp140_; + const gchar* _tmp141_; + gchar* _tmp142_; + _tmp139_ = prop; + _tmp140_ = _tmp139_->children; + _tmp141_ = _tmp140_->content; + _tmp142_ = g_strdup (_tmp141_); _g_free0 (value); - value = _tmp143_; + value = _tmp142_; } else { - xmlAttr* _tmp144_; - const gchar* _tmp145_; - _tmp144_ = prop; - _tmp145_ = _tmp144_->name; - if (g_strcmp0 (_tmp145_, "target") == 0) { - xmlAttr* _tmp146_; - xmlNode* _tmp147_; - const gchar* _tmp148_; - gchar* _tmp149_; - _tmp146_ = prop; - _tmp147_ = _tmp146_->children; - _tmp148_ = _tmp147_->content; - _tmp149_ = g_strdup (_tmp148_); + xmlAttr* _tmp143_; + const gchar* _tmp144_; + _tmp143_ = prop; + _tmp144_ = _tmp143_->name; + if (g_strcmp0 (_tmp144_, "target") == 0) { + xmlAttr* _tmp145_; + xmlNode* _tmp146_; + const gchar* _tmp147_; + gchar* _tmp148_; + _tmp145_ = prop; + _tmp146_ = _tmp145_->children; + _tmp147_ = _tmp146_->content; + _tmp148_ = g_strdup (_tmp147_); _g_free0 (target); - target = _tmp149_; + target = _tmp148_; } else { - xmlAttr* _tmp150_; - const gchar* _tmp151_; - _tmp150_ = prop; - _tmp151_ = _tmp150_->name; - g_warning ("dconf-schema.vala:119: Unknown property on , %s", _tmp151_); + xmlAttr* _tmp149_; + const gchar* _tmp150_; + _tmp149_ = prop; + _tmp150_ = _tmp149_->name; + g_warning ("dconf-schema.vala:111: Unknown property on , %s", _tmp150_); } } } } } - _tmp152_ = value; - if (_tmp152_ == NULL) { - g_warning ("dconf-schema.vala:124: Ignoring with no value"); + _tmp151_ = value; + if (_tmp151_ == NULL) { + g_warning ("dconf-schema.vala:116: Ignoring with no value"); _g_free0 (target); _g_free0 (value); continue; } - _tmp153_ = target; - if (_tmp153_ == NULL) { - g_warning ("dconf-schema.vala:129: Ignoring with no target"); + _tmp152_ = target; + if (_tmp152_ == NULL) { + g_warning ("dconf-schema.vala:121: Ignoring with no target"); _g_free0 (target); _g_free0 (value); continue; } - { - const gchar* _tmp154_; - GVariant* _tmp155_; - GVariant* _tmp156_; - const gchar* _tmp157_; - GVariant* _tmp158_; - SchemaChoice* _tmp159_; - _tmp154_ = target; - _tmp155_ = g_variant_new_string (_tmp154_); - _tmp156_ = g_variant_ref_sink (_tmp155_); - _g_variant_unref0 (v); - v = _tmp156_; - _tmp157_ = value; - _tmp158_ = v; - _tmp159_ = schema_choice_new (_tmp157_, _tmp158_); - self->choices = g_list_append (self->choices, _tmp159_); - } - goto __finally7; - __catch7_g_variant_parse_error: - { - GError* e = NULL; - const gchar* _tmp160_; - e = _inner_error_; - _inner_error_ = NULL; - _tmp160_ = target; - g_warning ("dconf-schema.vala:141: Invalid alias value '%s'", _tmp160_); - _g_error_free0 (e); - } - __finally7: - if (_inner_error_ != NULL) { - _g_variant_unref0 (v); - _g_free0 (target); - _g_free0 (value); - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return NULL; - } + _tmp153_ = target; + _tmp154_ = g_variant_new_string (_tmp153_); + _tmp155_ = g_variant_ref_sink (_tmp154_); + v = _tmp155_; + _tmp156_ = value; + _tmp157_ = v; + _tmp158_ = schema_choice_new (_tmp156_, _tmp157_); + self->choices = g_list_append (self->choices, _tmp158_); _g_variant_unref0 (v); _g_free0 (target); _g_free0 (value); @@ -1017,28 +972,28 @@ } } } else { - gboolean _tmp161_ = FALSE; - xmlNode* _tmp162_; - xmlElementType _tmp163_; - gboolean _tmp166_; - _tmp162_ = child; - _tmp163_ = _tmp162_->type; - if (_tmp163_ != XML_TEXT_NODE) { - xmlNode* _tmp164_; - xmlElementType _tmp165_; - _tmp164_ = child; - _tmp165_ = _tmp164_->type; - _tmp161_ = _tmp165_ != XML_COMMENT_NODE; + gboolean _tmp159_ = FALSE; + xmlNode* _tmp160_; + xmlElementType _tmp161_; + gboolean _tmp164_; + _tmp160_ = child; + _tmp161_ = _tmp160_->type; + if (_tmp161_ != XML_TEXT_NODE) { + xmlNode* _tmp162_; + xmlElementType _tmp163_; + _tmp162_ = child; + _tmp163_ = _tmp162_->type; + _tmp159_ = _tmp163_ != XML_COMMENT_NODE; } else { - _tmp161_ = FALSE; + _tmp159_ = FALSE; } - _tmp166_ = _tmp161_; - if (_tmp166_) { - xmlNode* _tmp167_; - const gchar* _tmp168_; - _tmp167_ = child; - _tmp168_ = _tmp167_->name; - g_warning ("dconf-schema.vala:146: Unknown child tag in , <%s>", _tmp168_); + _tmp164_ = _tmp159_; + if (_tmp164_) { + xmlNode* _tmp165_; + const gchar* _tmp166_; + _tmp165_ = child; + _tmp166_ = _tmp165_->name; + g_warning ("dconf-schema.vala:130: Unknown child tag in , <%s>", _tmp166_); } } } @@ -1545,7 +1500,7 @@ _tmp17_ = _tmp16_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_VARIANT_PARSE_ERROR) { - goto __catch8_g_variant_parse_error; + goto __catch6_g_variant_parse_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1554,15 +1509,15 @@ _g_variant_unref0 (self->min); self->min = _tmp17_; } - goto __finally8; - __catch8_g_variant_parse_error: + goto __finally6; + __catch6_g_variant_parse_error: { GError* e = NULL; e = _inner_error_; _inner_error_ = NULL; _g_error_free0 (e); } - __finally8: + __finally6: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1596,7 +1551,7 @@ _tmp28_ = _tmp27_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_VARIANT_PARSE_ERROR) { - goto __catch9_g_variant_parse_error; + goto __catch7_g_variant_parse_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1605,15 +1560,15 @@ _g_variant_unref0 (self->max); self->max = _tmp28_; } - goto __finally9; - __catch9_g_variant_parse_error: + goto __finally7; + __catch7_g_variant_parse_error: { GError* e = NULL; e = _inner_error_; _inner_error_ = NULL; _g_error_free0 (e); } - __finally9: + __finally7: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1624,7 +1579,7 @@ const gchar* _tmp30_; _tmp29_ = prop; _tmp30_ = _tmp29_->name; - g_warning ("dconf-schema.vala:212: Unknown property in , %s", _tmp30_); + g_warning ("dconf-schema.vala:196: Unknown property in , %s", _tmp30_); } } } @@ -1889,7 +1844,7 @@ const gchar* _tmp16_; _tmp15_ = prop; _tmp16_ = _tmp15_->name; - g_warning ("dconf-schema.vala:235: Unknown property in , %s", _tmp16_); + g_warning ("dconf-schema.vala:219: Unknown property in , %s", _tmp16_); } } } @@ -1998,7 +1953,7 @@ const gchar* _tmp46_; _tmp45_ = prop; _tmp46_ = _tmp45_->name; - g_warning ("dconf-schema.vala:255: Unknown property in enum , %s", _tmp46_); + g_warning ("dconf-schema.vala:239: Unknown property in enum , %s", _tmp46_); } } } @@ -2037,7 +1992,7 @@ const gchar* _tmp61_; _tmp60_ = child; _tmp61_ = _tmp60_->name; - g_warning ("dconf-schema.vala:265: Unknown tag in , <%s>", _tmp61_); + g_warning ("dconf-schema.vala:249: Unknown tag in , <%s>", _tmp61_); } } } @@ -2283,7 +2238,7 @@ const gchar* _tmp16_; _tmp15_ = prop; _tmp16_ = _tmp15_->name; - g_warning ("dconf-schema.vala:288: Unknown property in , %s", _tmp16_); + g_warning ("dconf-schema.vala:272: Unknown property in , %s", _tmp16_); } } } @@ -2392,7 +2347,7 @@ const gchar* _tmp46_; _tmp45_ = prop; _tmp46_ = _tmp45_->name; - g_warning ("dconf-schema.vala:308: Unknown property in flags , %s", _tmp46_); + g_warning ("dconf-schema.vala:292: Unknown property in flags , %s", _tmp46_); } } } @@ -2431,7 +2386,7 @@ const gchar* _tmp61_; _tmp60_ = child; _tmp61_ = _tmp60_->name; - g_warning ("dconf-schema.vala:318: Unknown tag in , <%s>", _tmp61_); + g_warning ("dconf-schema.vala:302: Unknown tag in , <%s>", _tmp61_); } } } @@ -2721,7 +2676,7 @@ const gchar* _tmp27_; _tmp26_ = prop; _tmp27_ = _tmp26_->name; - g_warning ("dconf-schema.vala:346: Unknown property on , %s", _tmp27_); + g_warning ("dconf-schema.vala:330: Unknown property on , %s", _tmp27_); } } } @@ -3245,7 +3200,7 @@ const gchar* _tmp73_; _tmp72_ = node; _tmp73_ = _tmp72_->name; - g_warning ("dconf-schema.vala:417: Unknown tag <%s>", _tmp73_); + g_warning ("dconf-schema.vala:401: Unknown tag <%s>", _tmp73_); } } } diff -Nru d-conf-0.11.3/editor/dconf-schema.vala d-conf-0.11.5/editor/dconf-schema.vala --- d-conf-0.11.3/editor/dconf-schema.vala 2011-10-31 23:18:00.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-schema.vala 2012-02-06 19:29:54.000000000 +0000 @@ -84,16 +84,8 @@ continue; } - Variant v; - try - { - v = new Variant.string (value); - choices.append (new SchemaChoice(value, v)); - } - catch (VariantParseError e) - { - warning ("Invalid choice value '%s'", value); - } + var v = new Variant.string (value); + choices.append (new SchemaChoice(value, v)); } } else if (child->name == "aliases") @@ -130,16 +122,8 @@ continue; } - Variant v; - try - { - v = new Variant.string (target); - choices.append (new SchemaChoice(value, v)); - } - catch (VariantParseError e) - { - warning ("Invalid alias value '%s'", target); - } + var v = new Variant.string (target); + choices.append (new SchemaChoice(value, v)); } } else if (child->type != Xml.ElementType.TEXT_NODE && child->type != Xml.ElementType.COMMENT_NODE) @@ -423,7 +407,7 @@ public void load_directory(string dir) throws Error { File directory = File.new_for_path(dir); - var i = directory.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME, 0, null); + var i = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0, null); FileInfo info; while ((info = i.next_file (null)) != null) { string name = info.get_name(); diff -Nru d-conf-0.11.3/editor/dconf-view.c d-conf-0.11.5/editor/dconf-view.c --- d-conf-0.11.3/editor/dconf-view.c 2012-01-27 07:27:31.000000000 +0000 +++ d-conf-0.11.5/editor/dconf-view.c 2012-02-06 19:33:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-view.c generated by valac 0.15.1, the Vala compiler +/* dconf-view.c generated by valac 0.15.1.20-908e, the Vala compiler * generated from dconf-view.vala, do not modify */ @@ -948,7 +948,7 @@ value = _tmp21_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_VARIANT_PARSE_ERROR) { - goto __catch10_g_variant_parse_error; + goto __catch8_g_variant_parse_error; } _g_object_unref0 (key); g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -960,8 +960,8 @@ key_set_value (_tmp22_, _tmp23_); _g_variant_unref0 (value); } - goto __finally10; - __catch10_g_variant_parse_error: + goto __finally8; + __catch8_g_variant_parse_error: { GError* e = NULL; GError* _tmp24_; @@ -985,7 +985,7 @@ _g_object_unref0 (dialog); _g_error_free0 (e); } - __finally10: + __finally8: if (_inner_error_ != NULL) { _g_object_unref0 (key); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); Binary files /tmp/BT5gZ0p5gf/d-conf-0.11.3/editor/icons/hicolor/14x14/apps/dconf-editor.png and /tmp/GtPJX1gwwz/d-conf-0.11.5/editor/icons/hicolor/14x14/apps/dconf-editor.png differ Binary files /tmp/BT5gZ0p5gf/d-conf-0.11.3/editor/icons/hicolor/92x92/apps/dconf-editor.png and /tmp/GtPJX1gwwz/d-conf-0.11.5/editor/icons/hicolor/92x92/apps/dconf-editor.png differ diff -Nru d-conf-0.11.3/editor/Makefile.am d-conf-0.11.5/editor/Makefile.am --- d-conf-0.11.3/editor/Makefile.am 2012-01-27 17:24:59.000000000 +0000 +++ d-conf-0.11.5/editor/Makefile.am 2012-02-05 20:31:20.000000000 +0000 @@ -16,11 +16,9 @@ nobase_data_DATA = $(icons) icons = \ - icons/hicolor/14x14/apps/dconf-editor.png \ icons/hicolor/32x32/apps/dconf-editor.png \ icons/hicolor/48x48/apps/dconf-editor.png \ icons/hicolor/64x64/apps/dconf-editor.png \ - icons/hicolor/92x92/apps/dconf-editor.png \ icons/hicolor/128x128/apps/dconf-editor.png install-data-hook: update-icon-cache diff -Nru d-conf-0.11.3/editor/Makefile.in d-conf-0.11.5/editor/Makefile.in --- d-conf-0.11.3/editor/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/editor/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -40,8 +40,7 @@ dconf-editor.c dconf-model.c dconf-schema.c dconf-view.c \ dconf_editor_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -234,11 +233,9 @@ gsettings_SCHEMAS = ca.desrt.dconf-editor.gschema.xml nobase_data_DATA = $(icons) icons = \ - icons/hicolor/14x14/apps/dconf-editor.png \ icons/hicolor/32x32/apps/dconf-editor.png \ icons/hicolor/48x48/apps/dconf-editor.png \ icons/hicolor/64x64/apps/dconf-editor.png \ - icons/hicolor/92x92/apps/dconf-editor.png \ icons/hicolor/128x128/apps/dconf-editor.png uidir = $(datadir)/dconf-editor diff -Nru d-conf-0.11.3/engine/dconf-engine.c d-conf-0.11.5/engine/dconf-engine.c --- d-conf-0.11.3/engine/dconf-engine.c 2011-10-19 22:01:15.000000000 +0000 +++ d-conf-0.11.5/engine/dconf-engine.c 2012-02-05 20:45:39.000000000 +0000 @@ -397,7 +397,7 @@ * ensure that values in the user database are always ignored when * locks are present. */ - for (i = engine->n_dbs - 1; lowest < i; i--) + for (i = MAX (engine->n_dbs - 1, lowest); lowest < i; i--) if (engine->lock_tables[i] != NULL && gvdb_table_has_value (engine->lock_tables[i], key)) break; @@ -637,14 +637,10 @@ gchar ** dconf_engine_list (DConfEngine *engine, const gchar *dir, - DConfResetList *resets, gint *length) { gchar **list; - /* not yet supported */ - g_assert (resets == NULL); - g_mutex_lock (&engine->lock); dconf_engine_refresh (engine); diff -Nru d-conf-0.11.3/engine/dconf-engine.h d-conf-0.11.5/engine/dconf-engine.h --- d-conf-0.11.3/engine/dconf-engine.h 2011-10-19 22:01:22.000000000 +0000 +++ d-conf-0.11.5/engine/dconf-engine.h 2012-02-05 20:45:31.000000000 +0000 @@ -22,8 +22,6 @@ #ifndef __dconf_engine_h__ #define __dconf_engine_h__ -#include -#include #include typedef struct _DConfEngine DConfEngine; @@ -97,7 +95,6 @@ G_GNUC_INTERNAL gchar ** dconf_engine_list (DConfEngine *engine, const gchar *path, - DConfResetList *resets, gint *length); G_GNUC_INTERNAL diff -Nru d-conf-0.11.3/engine/dconf-readtype.h d-conf-0.11.5/engine/dconf-readtype.h --- d-conf-0.11.3/engine/dconf-readtype.h 2011-08-03 22:07:20.000000000 +0000 +++ d-conf-0.11.5/engine/dconf-readtype.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#ifndef __dconf_readtype_h__ -#define __dconf_readtype_h__ - -typedef enum -{ - DCONF_READ_NORMAL, - DCONF_READ_SET, - DCONF_READ_RESET -} DConfReadType; - -#endif /* __dconf_readtype_h__ */ diff -Nru d-conf-0.11.3/engine/dconf-resetlist.c d-conf-0.11.5/engine/dconf-resetlist.c --- d-conf-0.11.3/engine/dconf-resetlist.c 2011-08-03 22:07:20.000000000 +0000 +++ d-conf-0.11.5/engine/dconf-resetlist.c 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru d-conf-0.11.3/engine/dconf-resetlist.h d-conf-0.11.5/engine/dconf-resetlist.h --- d-conf-0.11.3/engine/dconf-resetlist.h 2011-08-03 22:07:20.000000000 +0000 +++ d-conf-0.11.5/engine/dconf-resetlist.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#ifndef __dconf_resetlist_h__ -#define __dconf_resetlist_h__ - -#include - -typedef struct -{ - gpointer opaque[8]; -} DConfResetList; - -void dconf_reset_list_init (DConfResetList *list, - const gchar *prefix, - const gchar * const *rels, - gsize n_rels); -void dconf_reset_list_add (DConfResetList *list, - const gchar *path); -void dconf_reset_list_clear (DConfResetList *list); - - -#endif /* __dconf_resetlist_h__ */ diff -Nru d-conf-0.11.3/engine/Makefile.am d-conf-0.11.5/engine/Makefile.am --- d-conf-0.11.3/engine/Makefile.am 2011-08-03 22:07:20.000000000 +0000 +++ d-conf-0.11.5/engine/Makefile.am 2012-02-05 20:42:56.000000000 +0000 @@ -1,8 +1,5 @@ dconfinclude_HEADERS = \ - dconf-readtype.h \ - dconf-resetlist.h \ dconf-engine.h EXTRA_DIST = \ - dconf-resetlist.c \ dconf-engine.c diff -Nru d-conf-0.11.3/engine/Makefile.in d-conf-0.11.5/engine/Makefile.in --- d-conf-0.11.3/engine/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/engine/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -36,8 +36,7 @@ DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -193,12 +192,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dconfinclude_HEADERS = \ - dconf-readtype.h \ - dconf-resetlist.h \ dconf-engine.h EXTRA_DIST = \ - dconf-resetlist.c \ dconf-engine.c all: all-am diff -Nru d-conf-0.11.3/gsettings/Makefile.in d-conf-0.11.5/gsettings/Makefile.in --- d-conf-0.11.3/gsettings/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/gsettings/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -36,8 +36,7 @@ subdir = gsettings DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/gvdb/Makefile.in d-conf-0.11.5/gvdb/Makefile.in --- d-conf-0.11.3/gvdb/Makefile.in 2012-01-27 17:25:01.000000000 +0000 +++ d-conf-0.11.5/gvdb/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -34,8 +34,7 @@ subdir = gvdb DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -Nru d-conf-0.11.3/m4/gtk-doc.m4 d-conf-0.11.5/m4/gtk-doc.m4 --- d-conf-0.11.3/m4/gtk-doc.m4 2012-01-26 05:33:05.000000000 +0000 +++ d-conf-0.11.5/m4/gtk-doc.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) - fi - fi - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) diff -Nru d-conf-0.11.3/Makefile.in d-conf-0.11.5/Makefile.in --- d-conf-0.11.3/Makefile.in 2012-01-27 17:25:02.000000000 +0000 +++ d-conf-0.11.5/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -38,8 +38,7 @@ $(top_srcdir)/configure COPYING NEWS aux/depcomp \ aux/install-sh aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff -Nru d-conf-0.11.3/NEWS d-conf-0.11.5/NEWS --- d-conf-0.11.3/NEWS 2012-01-27 17:24:59.000000000 +0000 +++ d-conf-0.11.5/NEWS 2012-02-06 19:32:17.000000000 +0000 @@ -1,3 +1,14 @@ +Changes in dconf 0.11.5 +======================= + + - do not install non-standard icon sizes + + - fix a bug with getting default values when no profile is in use + + - some general code cleanups on the client side + + - improve Makefile compatibility: avoid using 'echo -e' + Changes in dconf 0.11.3 ======================= diff -Nru d-conf-0.11.3/service/Makefile.am d-conf-0.11.5/service/Makefile.am --- d-conf-0.11.3/service/Makefile.am 2011-10-15 21:02:54.000000000 +0000 +++ d-conf-0.11.5/service/Makefile.am 2012-02-05 20:38:48.000000000 +0000 @@ -22,4 +22,7 @@ DISTCLEANFILES = ca.desrt.dconf.service ca.desrt.dconf.service: Makefile - $(AM_V_GEN) echo -e '[D-BUS Service]\nName=ca.desrt.dconf\nExec=${libexecdir}/dconf-service' > $@ + $(AM_V_GEN) (echo '[D-BUS Service]'; \ + echo 'Name=ca.desrt.dconf'; \ + echo 'Exec=${libexecdir}/dconf-service') > $@.tmp && \ + mv $@.tmp $@ diff -Nru d-conf-0.11.3/service/Makefile.in d-conf-0.11.5/service/Makefile.in --- d-conf-0.11.3/service/Makefile.in 2012-01-27 17:25:02.000000000 +0000 +++ d-conf-0.11.5/service/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -37,8 +37,7 @@ subdir = service DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -614,7 +613,10 @@ ca.desrt.dconf.service: Makefile - $(AM_V_GEN) echo -e '[D-BUS Service]\nName=ca.desrt.dconf\nExec=${libexecdir}/dconf-service' > $@ + $(AM_V_GEN) (echo '[D-BUS Service]'; \ + echo 'Name=ca.desrt.dconf'; \ + echo 'Exec=${libexecdir}/dconf-service') > $@.tmp && \ + mv $@.tmp $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru d-conf-0.11.3/tests/Makefile.in d-conf-0.11.5/tests/Makefile.in --- d-conf-0.11.3/tests/Makefile.in 2012-01-27 17:25:02.000000000 +0000 +++ d-conf-0.11.5/tests/Makefile.in 2012-02-06 19:33:20.000000000 +0000 @@ -36,8 +36,7 @@ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d