diff -Nru colord-1.3.2/aclocal.m4 colord-1.3.3/aclocal.m4 --- colord-1.3.2/aclocal.m4 2016-02-17 13:32:55.000000000 +0000 +++ colord-1.3.3/aclocal.m4 2016-07-11 15:00:38.000000000 +0000 @@ -20,221 +20,6 @@ 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 - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - dnl GLIB_GSETTINGS dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether dnl the schema should be compiled @@ -416,6 +201,282 @@ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +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 +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl 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]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +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 +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +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 +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl 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 +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru colord-1.3.2/ChangeLog colord-1.3.3/ChangeLog --- colord-1.3.2/ChangeLog 2016-03-21 11:48:32.000000000 +0000 +++ colord-1.3.3/ChangeLog 2016-07-27 13:05:09.000000000 +0000 @@ -1,7 +1,147 @@ +commit 7437d21fe5c9cf2825c77f4c1f9493ab4d3318e4 +Author: Richard Hughes +Date: 2016-07-27 + + Release colord 1.3.3 + +M NEWS +M doc/website/download.html +M po/de.po +M po/hu.po +M po/id.po +C079 po/id.po po/is.po +M po/ko.po +C079 po/id.po po/lt.po +C079 po/id.po po/oc.po +M po/tr.po + +commit 4c20ac1bd802947721be0c15a0ac465b7c1873a4 +Merge: 2f9b089 259a87c +Author: Richard Hughes +Date: 2016-07-20 + + Merge pull request #31 from lantw44/master + + build: Fix gtk-doc build when srcdir != builddir + +commit 259a87c560407b91595ee1ca4fe8d16d67f618c1 +Author: Ting-Wei Lan +Date: 2016-06-14 + + build: Fix gtk-doc build when srcdir != builddir + + https://bugs.freedesktop.org/show_bug.cgi?id=96520 + +M doc/api/Makefile.am + +commit 2f9b0890fad22cc686b3f1293c961493d01e923b +Merge: 760e79c b5dae81 +Author: Richard Hughes +Date: 2016-07-06 + + Merge pull request #30 from ebassi/polkit-autoptr + + Check polkit version before defining g_autoptr macros + +commit b5dae8163e715980f476cde4ea5e2ee8ee897d44 +Author: Emmanuele Bassi +Date: 2016-07-06 + + Check polkit version before defining g_autoptr macros + + We cannot check on the internal name created by G_DECLARE_AUTO* macros + because it's not a pre-processor symbol. + + Instead, we should check whether we're being built against a + version of + PolKit that has those symbols, and only define them ourselves for + previous versions. + + This commit fixes a build failure in GNOME Continuous. + +M configure.ac +M src/cd-common.c + +commit 760e79ccafc97bc7973e4e2d11bb6ca5d6eed1e0 +Merge: 003e401 48f5176 +Author: Richard Hughes +Date: 2016-07-05 + + Merge pull request #29 from Hextremist/master + + Increase timeout to 60s for argyll spotread sampling + +commit 48f5176e35b3ab69e5df650f1971dec295fc2b18 +Author: Kjell Irgens +Date: 2016-07-05 + + Increase timeout to 60s for argyll spotread sampling + + There was a 10s timeout for spotread to finish sampling. This works + fine for light colors, in which case it may finish in as little as 3 + seconds. But the darker the color is, the longer it takes to finish. + When measuring black, it takes around 25-30 seconds for my Spyder 3 + Express. + + The timeout caused Gnome Control Panel to fail when attempting to + calibrate. + +M src/sensors/cd-sensor-argyll.c + +commit 003e401b6b76bc8ae445b0c152f7ff41d1eaab5e +Author: Richard Hughes +Date: 2016-04-18 + + Use the USB path to match the ArgyllCMS port + + Fixes https://github.com/hughsie/colord/issues/24 + +M src/cd-sensor.c +M src/cd-sensor.h +M src/sensors/cd-sensor-argyll.c + +commit 5256a11638c797809c183f2e468475f6a5fb7a52 +Author: Richard Hughes +Date: 2016-04-18 + + libcolord: Fix an assert failure when connecting to sensors + + Do not manually disconnect this as g_signal_connect_object() does + this already. + + Hopefully fixes https://github.com/hughsie/colord/issues/23 + +M lib/colord/cd-device.c +M lib/colord/cd-profile.c +M lib/colord/cd-sensor.c + +commit 8a5eaac276ffe16e81c58994989ec7319ef00bf2 +Author: Richard Hughes +Date: 2016-03-21 + + trivial: post release version bump + +M RELEASE +M configure.ac + +commit 06aec25df06c7f9115d1d2a38fd9d2fb58a65d61 +Author: Richard Hughes +Date: 2016-03-21 + + Release colord 1.3.2 + +M NEWS +M RELEASE +M doc/website/download.html +M po/ca.po +M po/id.po +M po/pt_BR.po +M po/sr.po + commit 6949c2a1a62cd44e7e6c25e6db4a5a88d6ab5efd Merge: d9c9255 8e27af8 Author: Richard Hughes -Date: 2016-03-21 +Date: 2016-03-21 Merge pull request #22 from canek-pelaez/master @@ -10,7 +150,7 @@ commit 8e27af8feeea71ed79c06c46a28b0e445cef46cb Author: Canek Peláez Valdés -Date: 2016-03-20 +Date: 2016-03-20 session-helper: Replace '/' with '-' on the basename so creating the profile file doesn't fail. diff -Nru colord-1.3.2/config.h colord-1.3.3/config.h --- colord-1.3.2/config.h 2016-02-17 13:19:04.000000000 +0000 +++ colord-1.3.3/config.h 2016-07-11 15:00:43.000000000 +0000 @@ -96,7 +96,7 @@ #define PACKAGE_NAME "colord" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "colord 1.3.2" +#define PACKAGE_STRING "colord 1.3.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "colord" @@ -105,7 +105,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.2" +#define PACKAGE_VERSION "1.3.3" + +/* if PolKit has autoptr macros */ +/* #undef POLKIT_HAS_AUTOPTR_MACROS */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -117,4 +120,4 @@ #define USE_POLKIT 1 /* Version number of package */ -#define VERSION "1.3.2" +#define VERSION "1.3.3" diff -Nru colord-1.3.2/config.h.in colord-1.3.3/config.h.in --- colord-1.3.2/config.h.in 2016-02-17 13:32:59.000000000 +0000 +++ colord-1.3.3/config.h.in 2016-07-11 15:00:42.000000000 +0000 @@ -106,6 +106,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* if PolKit has autoptr macros */ +#undef POLKIT_HAS_AUTOPTR_MACROS + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru colord-1.3.2/configure colord-1.3.3/configure --- colord-1.3.2/configure 2016-02-17 13:32:56.000000000 +0000 +++ colord-1.3.3/configure 2016-07-11 15:00:40.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for colord 1.3.2. +# Generated by GNU Autoconf 2.69 for colord 1.3.3. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='colord' PACKAGE_TARNAME='colord' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='colord 1.3.2' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='colord 1.3.3' PACKAGE_BUGREPORT='http://www.freedesktop.org/software/colord/' PACKAGE_URL='' @@ -1557,7 +1557,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 colord 1.3.2 to adapt to many kinds of systems. +\`configure' configures colord 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1627,7 +1627,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of colord 1.3.2:";; + short | recursive ) echo "Configuration of colord 1.3.3:";; esac cat <<\_ACEOF @@ -1833,7 +1833,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -colord configure 1.3.2 +colord configure 1.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2202,7 +2202,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by colord $as_me 1.3.2, which was +It was created by colord $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3067,7 +3067,7 @@ # Define the identity of the package. PACKAGE='colord' - VERSION='1.3.2' + VERSION='1.3.3' cat >>confdefs.h <<_ACEOF @@ -13221,7 +13221,7 @@ # use this in cd-version.h CD_MAJOR_VERSION=1 CD_MINOR_VERSION=3 -CD_MICRO_VERSION=2 +CD_MICRO_VERSION=3 @@ -18304,6 +18304,17 @@ $as_echo "#define USE_POLKIT 1" >>confdefs.h + + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= 0.114\""; } >&5 + ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= 0.114") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + +$as_echo "#define POLKIT_HAS_AUTOPTR_MACROS 1" >>confdefs.h + +fi fi @@ -20044,7 +20055,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by colord $as_me 1.3.2, which was +This file was extended by colord $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20110,7 +20121,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -colord config.status 1.3.2 +colord config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru colord-1.3.2/configure.ac colord-1.3.3/configure.ac --- colord-1.3.2/configure.ac 2016-02-17 13:32:11.000000000 +0000 +++ colord-1.3.3/configure.ac 2016-07-07 07:55:11.000000000 +0000 @@ -3,7 +3,7 @@ m4_define([cd_major_version], [1]) m4_define([cd_minor_version], [3]) -m4_define([cd_micro_version], [2]) +m4_define([cd_micro_version], [3]) m4_define([cd_version], [cd_major_version.cd_minor_version.cd_micro_version]) @@ -248,6 +248,10 @@ if test x$enable_polkit = xyes; then PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= 0.103) AC_DEFINE(USE_POLKIT, 1, [if we should use PolicyKit]) + + PKG_CHECK_EXISTS([polkit-gobject-1 >= 0.114], + [AC_DEFINE(POLKIT_HAS_AUTOPTR_MACROS, 1, [if PolKit has autoptr macros])], + []) fi dnl --------------------------------------------------------------------------- diff -Nru colord-1.3.2/debian/changelog colord-1.3.3/debian/changelog --- colord-1.3.2/debian/changelog 2016-04-20 21:06:56.000000000 +0000 +++ colord-1.3.3/debian/changelog 2016-09-06 06:46:05.000000000 +0000 @@ -1,3 +1,20 @@ +colord (1.3.3-2) unstable; urgency=medium + + * Tell dh_install that systemd/udev files are uninteresting for !Linux + + -- Christopher James Halse Rogers Tue, 06 Sep 2016 16:46:05 +1000 + +colord (1.3.3-1) unstable; urgency=medium + + * debian/watch: check upstream release signatures + * Add systemd to linux-any build-depends to pick up tmpfiles.d and unit + locations. + (Closes: 835758) + * Remove linux-only udev/systemd files from non-linux colord.install. + (Closes: 827321) + + -- Christopher James Halse Rogers Mon, 05 Sep 2016 15:18:36 +1000 + colord (1.3.2-1) unstable; urgency=medium * New upstream 1.3.2 release (Closes: 815252) diff -Nru colord-1.3.2/debian/colord.install colord-1.3.3/debian/colord.install --- colord-1.3.2/debian/colord.install 2016-04-20 21:06:56.000000000 +0000 +++ colord-1.3.3/debian/colord.install 2016-09-06 06:46:05.000000000 +0000 @@ -1,5 +1,4 @@ debian/tmp/etc/ -lib/udev/rules.d/ usr/bin/ usr/lib/colord* usr/lib/*/colord-sensors/libcolord_sensor_dummy.so @@ -8,6 +7,3 @@ usr/share/man usr/share/polkit-1 usr/share/bash-completion -lib/systemd/system/*.service -usr/lib/systemd/user/ -usr/lib/tmpfiles.d/ diff -Nru colord-1.3.2/debian/control colord-1.3.3/debian/control --- colord-1.3.2/debian/control 2016-04-20 21:06:56.000000000 +0000 +++ colord-1.3.3/debian/control 2016-09-06 06:46:05.000000000 +0000 @@ -22,6 +22,7 @@ gtk-doc-tools, autopoint, libsystemd-dev [linux-any], + systemd [linux-any], bash-completion, dh-systemd (>= 1.4), Build-Depends-Indep: diff -Nru colord-1.3.2/debian/not-installed colord-1.3.3/debian/not-installed --- colord-1.3.2/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.3/debian/not-installed 2016-09-06 06:46:05.000000000 +0000 @@ -0,0 +1,5 @@ +# There's no point installing the systemd or udev files on !linux +usr/lib/systemd/user/colord-session.service +lib/udev/rules.d/69-cd-sensors.rules +lib/udev/rules.d/95-cd-devices.rules + diff -Nru colord-1.3.2/debian/patches/debian-changes colord-1.3.3/debian/patches/debian-changes --- colord-1.3.2/debian/patches/debian-changes 2016-04-20 21:56:29.000000000 +0000 +++ colord-1.3.3/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -These are patches cherry-picked from upstream - gitorious.org:colord/master.git -They are applied inline, rather than as separate patches, so that they -automatically go away once the upstream release containing them is merged in. ---- colord-1.3.2.orig/lib/colord/cd-device.c -+++ colord-1.3.2/lib/colord/cd-device.c -@@ -2235,7 +2235,6 @@ cd_device_finalize (GObject *object) - { - CdDevice *device = CD_DEVICE (object); - CdDevicePrivate *priv = GET_PRIVATE (device); -- guint ret; - - g_return_if_fail (CD_IS_DEVICE (object)); - -@@ -2249,17 +2248,8 @@ cd_device_finalize (GObject *object) - g_free (priv->vendor); - g_strfreev (priv->profiling_inhibitors); - g_ptr_array_unref (priv->profiles); -- if (priv->proxy != NULL) { -- ret = g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_device_dbus_signal_cb), -- device); --// g_assert (ret > 0); -- ret = g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_device_dbus_properties_changed_cb), -- device); --// g_assert (ret > 0); -+ if (priv->proxy != NULL) - g_object_unref (priv->proxy); -- } - - G_OBJECT_CLASS (cd_device_parent_class)->finalize (object); - } ---- colord-1.3.2.orig/lib/colord/cd-profile.c -+++ colord-1.3.2/lib/colord/cd-profile.c -@@ -1489,15 +1489,8 @@ cd_profile_finalize (GObject *object) - g_free (priv->format); - g_free (priv->title); - g_strfreev (priv->warnings); -- if (priv->proxy != NULL) { -- g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_profile_dbus_signal_cb), -- profile); -- g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_profile_dbus_properties_changed_cb), -- profile); -+ if (priv->proxy != NULL) - g_object_unref (priv->proxy); -- } - - G_OBJECT_CLASS (cd_profile_parent_class)->finalize (object); - } ---- colord-1.3.2.orig/lib/colord/cd-sensor.c -+++ colord-1.3.2/lib/colord/cd-sensor.c -@@ -1612,7 +1612,6 @@ cd_sensor_finalize (GObject *object) - { - CdSensor *sensor = CD_SENSOR (object); - CdSensorPrivate *priv = GET_PRIVATE (sensor); -- guint ret; - - g_return_if_fail (CD_IS_SENSOR (object)); - -@@ -1623,17 +1622,8 @@ cd_sensor_finalize (GObject *object) - g_free (priv->vendor); - g_hash_table_unref (priv->options); - g_hash_table_destroy (priv->metadata); -- if (priv->proxy != NULL) { -- ret = g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_sensor_dbus_signal_cb), -- sensor); -- g_assert (ret > 0); -- ret = g_signal_handlers_disconnect_by_func (priv->proxy, -- G_CALLBACK (cd_sensor_dbus_properties_changed_cb), -- sensor); -- g_assert (ret > 0); -+ if (priv->proxy != NULL) - g_object_unref (priv->proxy); -- } - - G_OBJECT_CLASS (cd_sensor_parent_class)->finalize (object); - } diff -Nru colord-1.3.2/debian/patches/series colord-1.3.3/debian/patches/series --- colord-1.3.2/debian/patches/series 2016-04-20 21:56:29.000000000 +0000 +++ colord-1.3.3/debian/patches/series 2016-09-06 06:46:05.000000000 +0000 @@ -1,2 +1 @@ -debian-changes diff -Nru colord-1.3.2/debian/rules colord-1.3.3/debian/rules --- colord-1.3.2/debian/rules 2016-04-20 21:06:56.000000000 +0000 +++ colord-1.3.3/debian/rules 2016-09-06 06:46:05.000000000 +0000 @@ -19,7 +19,6 @@ --disable-examples \ --disable-static \ --with-daemon-user=colord \ - --with-systemdsystemunitdir=/lib/systemd/system \ --with-udevrulesdir=/lib/udev/rules.d \ --enable-vala \ --disable-silent-rules diff -Nru colord-1.3.2/debian/upstream/signing-key.asc colord-1.3.3/debian/upstream/signing-key.asc --- colord-1.3.2/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ colord-1.3.3/debian/upstream/signing-key.asc 2016-09-06 06:46:05.000000000 +0000 @@ -0,0 +1,110 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBEgu03ABCAC+4WHuoCNAN0G1jHRSF2DAphtTIuZkhKbd3C1BMzvU40O5cwhW +LWILM1IYa4YwYI77tJsLi1Hax9D59NNAKdESqsKGuN/QbeXuAD3qpKA6B51lZD9k +jPizCl+s3q+NxaJb8Rk92yocYyuolNii5qrkD1YazcbFCkuBX2wg7q1hqU8YaGNx +Q3SuKf4Rkkg9T/6mCz6hEE8z4sVLncFY7pqt6ch+ycGz4MWGo9Eh51HvYi2QmSf3 +6OjNrKHp1LwPF1V/LYI9dHPXfeWE3tgco8hhDsgYaG2W3yhk8Pn5BhnNGgmiCXQs +Allf7a3U/leXgOMTVJNvx+8yNrHRuI2YZMRhABEBAAG0JFJpY2hhcmQgSHVnaGVz +IDxyaWNoYXJkQGh1Z2hzaWUuY29tPokBNgQTAQIAIAUCSC7TcAIbLwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEBesuo36lw4XBVIH/RKjtx2Xk1782CGX9PZnwLaC +krfPTDlcusAFwqtV9AiECenXGLS3A3Kcq6BOJ9wCh1FF80mRJMwRn2ONvHEkg1Dh +8amv4YD9y4r6mjA6tyk7MOPNCSc8ZYZHUl/RacHAOePnKjMWSsU7n6v+RTpjOWR5 +JjyMlIHv7K9h6KEx5VCLaDXLxluQvPc8uYBZJlMBa3K/pGS18RJKKrw0l5/8p5tY +uWPxL4Zay7SWdGiiy3EPcq3GJXu85I1x+LbMbq69BjwQt28B/5iMD0RCbYF0mHG2 +6iQNU1Gr8+BX2+CFXLSbo1rPExsrOO3Maz7OjX4VathnqS0h9I+Q3dFlnks6Ic/R +zxnPFwEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgG +BgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx +NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIy +MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACQAH0DASIA +AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgED +AwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2Jy +ggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1 +dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJ +ytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAA +AAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJB +UQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNE +RUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJma +oqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP0 +9fb3+Pn6/9oADAMBAAIRAxEAPwDtVhmb0FSLaOfvNV4LS4rmJKq2a9yakFrGO1WA +Kpapq1lo1o11fTrFGo6nv7CgLFkQoozgACud1nxx4d0HetzfRtMv/LGL5m/SvLvG +HxR1HVGe10gm1tPus4Hzv757CvOJS8h8yR9xPU55NUo3K5e57VL8bbBXYQaVM4/h +LSAZ/Sn23xptHb9/pMyJ6pICf6V4aGyflFWYmJGGxVOBSSPoTTvit4cvZFSVprVj +xmVOPzGa7OzvbW/gWe0uI5o25DRsCK+T9o525I/lVvTPEOqaBdiawupIWB5A6N9R +0NTyvoJxPq7FGK868G/FSw1xI7XVGjtb8naMcI59vSvRlIZQykEHoRUkNCVn6r/q +R9a0qztUH7taBDtLGLXPvV2q2nDFoPrVrFAFelxSCgnAJpDMXxH4kttAtCzkGZlJ +Re3414vrfiX+3b5pLr992CEkKPoBS/EPWJrzxDMjsQinaoBB4rQ8DeF47krf3ceR +1jVv51nNpLmkdlCF3ZbmRNoS3tiZbezaJ8epxXMzaTOrnzFOFznjpivpGLSoHi2G +NcemKyrvwZZzb1EQG7g4rGniGmdlTC3R4Pb6cDyFzxnmrtvpMk7BY0JbOMAV6W3w +9mguv3Kh4zkD1Ga7jwz4EtdPtxLdKHlJzjHSrdZyehl7FQV5Hitr4IvrxisULZAz +nHWs3VPBmq2BYS2zADvjg19Sx6fa23+qiVfwqC8s4LqMpLGrA+oqfaziPkpzPkGS +ymt5MsrLg+leufDb4gTCZNI1eV33HEUrH9DUvjLwgmnTmaKPdaSZyO6VwM1i1jcp +IhfbnKuBWqr825jPDW2Pp0ENgg8Gs7Vj8qCsnwLq76roEfmnMsXysfX0rV1Xqlap +3VzikrOxY08f6ItWqr2I/wBFSrJFBJTpHUtGwU4JHFOo7Uhnzjrlg0/jue0cs5E2 +GLH8a9f0W3jht0VFAVQFFed6tAIviff4O4eYG5HqoP8AWvQtKlOwjtnNc1d3aR6m +EVlc6WHke1XYU3dR0qhbOP0rQhIHRs1zxjqehJ3RdSJMDK1aQY4HSoEIMY9amBGO +tdCRwVE5BJgfWoSPensRnr1pOKTQoxsjG1yyS90uaJwOQcE9jXht3C0FzLbyrwGO +B2r3y/8A+PaT0rxLxGFi1OXnABzUxV3Yqq7JM7P4YEC0u0HRWGOK63UseYua5H4X +BTYXzqf+WgBFdXqZ/fKPauuCsrHmVXeTZo2Y/wBFSpWPNRWnFqn0p5qzMq0vUUlL +UjPIPEMCx/EycYx5sKv9eAP6V0mnOVlA9awvFNsB42hvd7ecJTEVPQpg4x9OKumS ++EyLaxrx1djXNPV6HqUU4JJndWqMwHGK1IrZgFwa83m1nxFp4BjjSaMc9QfwrZ0P +xtLcSrFfQCJ89hioUGtzq9omrI7tco2DUqfMfaqaXsc8YdeR1rndU8UT2wljtFG8 +ZwxHStDNrS7OwaOozlc15rB4i1u+b/SNTt4FPZWGcfhXRWk+UUf2uu/HA9f1pNPo +RFd2b86hkYHkGvFPH8KWerFGbaJR8teyrNttPMuZYxtHzPnCivOfFWl/2t4m09pF +xHLleR0Xrn8cVMGubUdVXjZEvwkdzYX+5G2NIrI+ODxz/Sux1I/6QKhtbKSxfToY +V8q2APyKMZIHepNSP+lCuiEua5wYqiqbTT3Na34t0+lONNh/1CfSn1ocxUpaKKQH +n3jSxeXUFmt3CTJMrKWGR93JHHrWY8VybJJmRGlwd+1epz274rpdcieS4uSRwh3g +/hioNPTfbBTGHB/2tv8AQ1yyetj14QvGL8kefSNqcoldYCHU4CSZy30Cn+tPjj1S +KEzyRNGQfuKrE4x1wc4/A16DLpLEkrGAPQtnH6VUmsJTGYwFUeoOf/1VqpLltYl0 +5c1y34HGq6tpIuH1R4SAVVFgUjAPBO4Ek/lXP6hFf3VxeRzRF7iGTBdY8Aj2znHT +n/69d/4Rs1sLPygMKOgFW7rSI5bmS4VVBk++GGQfes+ZM15GrI8gOlaqblPssqmM +r825RkH/AIEDXV6LoOp+eS8sXldl5BP1HQfhXXL4ftw2VCZ9iR/WtK204wqRG8a+ +4Uk/mTRKTkrJCjTUW22YVvoU0nltdXjtawzMyW6gBcgkAH1A7CtCfTlvZlAOHUHD +A4IHsa03txBAFBJHcnqSeSarWj77ravPykcVk782porcraJIYWjQxyuXMZBBJzzW +ZqHN3W9OgDqcnAGAPU+v5VgX8ka3h3uq/U4rqpLQ87GS5mjZj4iX6UtVxfWiIu66 +hHHeQVMksUq7o5EdfVTmtrM4xojNV729tNPjD3dxHCD03HrWf/wm2hDzs3DKIgTl +kOGx6GvJ9d8SLql9LcvKGZj8i54A7AVVOlKT1HKSWx6Pq6pJBLfpc2wspEz5zyYA +GMVj6LfJ5alXVlYZDDoR6ivKb/ULy7tYoGnlWBSSId3yhvXFdf4aeR9Hg2Nl41wR +64OKxxFD2aUjtwmIc3y9kemLdReUSxrHvL6KPDMP3fPPvVKGZ5FXcflxmkuZRcRm +NVB7Yrn3O9yR0Hh7X7aRD+8UgMRwa0X8S6eLloF3tJ22oSM/XpXAWunTLPvijZfX +bxXT6bHJkGZBHg9WYCqUdCea7NCdbyIebFJ77TU1lrBZSr5DjqKr6lrOnWkP7+7t +1/3pAKz9LuodUR54DlFPyuO//wBapeiuU30N9dT+0ZT061h6xqtzo2mXN5ZqjTxx +s6q/Q4Gefyq3ANiSy46sRj6cVheKHL6JfDP/ACxKZHq3FTBXmiajtBswh4y1bXoF +e+k+zx4+7bkr+fc1Sm1NIcbZWfPQ9axYke1gIgz5oGSrHh/X8aIpIkYsVcNnncOh +9PevchTjBWR4M5ym7tm5AtxeAvISkZ7k1aRRCNoncf8AbQLWKL2dIBndIH/2fmX8 +B1FSkBAMjcSM/M4U/liq9SDnru7mlWRBIQm3OB9azo2aS1dWbcQe9Tu22Qd1YYNV +oflaeM+xFXaxCKIlP2oQhiQOuTXYeDNTEd1PaMwyrCRR/sng/qP1rjfJ/wBIY5Pu +Kjhu5LDU0vIRjy2wwHcelc2Ip89No6sPU5Kike7WiwSh43HAPGD2rBvdJu9OvjdW +tzcyWj/fh3/Mh9s9qbpOqR3tvFcRNuVhXSRqZFIPPHT1FeRF20Z7Oj1MqzutPkiJ +nm1W3lCjH7vdk9+VBrbjm05+bSyvb1xsO+4yijB+b72O3tVZLRY5QyZGewrWs2ck +fu8j6VpfTQtQg92ym/hODXblJr60hhhQ58tBy3XgmtyO2gsEMcKBVAwFAwBWnb7j +ACFx65rOvW2S7iMH09axlJvQrlitiC4kEMIjzzjmud12UNoE7HpJKq5+hz/SrGoX +TvIFBy7nCisvxRIYLKzsgeAS7H1P+TWlGPvxXmc9aXuSfkclO22YMpwEGWPtVSPd +czeawxGPuii8bzJPL5G5sGpQ4RQowP7oFe2eHYt+YchIx+8OMn0q1HFGq5kOWPdu +9UYttrH5r/fPQetKbuNeZpNpboM9BRa+wr9zmpcYMhbhRwPeq9s7TkSMAC6kfXBp +Lk/uz70y1kUJGD/C36GtGSiKVgkrgdc1VVN3mZ6MT1q7cRqHdsdTnNVvvKakpGl4 +U1CbT9SNqWJhkyVB9a9Z0vUo5QhLD0rxm1JWZHH30OV+tdva3DPbx3dscq65K+nt +XlYynyy5l1PUwdTmjyvoeqWscTsGbGOxrXgFujADb+HavM9M8YLagJOhOPUZxWqP +GVkTuDD8BXKkelzpI9AkniRGG4CuR1rWIomO1tz9MCsG48TT3bbLZGfPA4pbHT5J +pvOujlic47U+VGDm3saOk28ksn2ucfMfug9hXH69qwvvElzEnzJbgRr6Z5zW74m8 +UQ6RaNZ2rg3TLyR/yzHr9a8706dlWa5fq7E5NduFoPm9pL5HDiqyUfZR+Zddl+1u +zH5VyaWImaUyMcKO/oKpFzJJ5WeScuRViZlwluhKhh8x74/+vXoWPOJnuTKTOc+U +nCD1NLBbi4TzrkAs/QdMCokeKZ9gOIox8wHT6U5rqeVj5C/KOCSKpITZz8w3J60S +xiO0Vu/3qeoZm2jnNEy4j2e1UTcJP3iDvkVVMe0e1WbZJJLYbUYkDHApnlupKSKV +PowxUlXILQ7rhR71s6VfnTrl7SRv3EpLxE/wt3FYtsNt3j3q9cxrKm1s44YEHBBr +CtTU42ZrSqOEro7G3ezvvlkVQ/rWjDo9orBgufxzXncdzJCVZJGB9x1rTj8RXKR7 +WJY+3FcP1Sdz0FjI2PRIntbdcLtGPasTW/GKwK1tpzAyngydl+nqa4y61e8ugVMh +SM9Qp61HDCMB3JVP1NdVLCJazOari29IkjRy3e93fLE5d2P+cmlJ8vy4l6INx/Dp ++tMa6Es4ghH7uP5m/pUauZlmfJ+Z9oPsP/111WOQu2YO1pD/ABc5x2pnnDc0p6jk +j9B/Wgtstyo6kYqsJFU4boDk59AMUeYFlNzFLZD88h3OfQf/AKq1PtEdsBFETtA6 +gday7YPHGWxmaXk+w7Cr0ISMFW+dx1NUSf/ZiQE2BBMBAgAgBQJILtO3AhsvBgsJ +CAcDAgQVAggDBBYCAwECHgECF4AACgkQF6y6jfqXDhfY3Qf/SlnPXaroDTLJCAYS +pAJw5utI10JzXtUFy2oO9flU0/6c49VpD/ie53FobvJmMpzYk5khBAXqRSbfSl4l +6u/y9thQKKb73Y1kkAw1XUyBenqjttQC9rEYFghr2G+DPASzZBPfUw7yl7zDjwU4 +tBceleZAX0wBfR6ZTHC0BTq2PC/KO+1BgWpLW8TYuGyl4/S62X13R3cSaUoye3ZW +3mNYHrmngVLaBvqBRVic+63wwBnIOoI012kO8yfqmOg0H7zgUBH6I/DBYYOxXOCk +AhIdaN3ZhkLoo/zv35i3xA2QRUUrKH1nQPxA0GKJoFfi3R+gtNifbqv0G0aRZ0rZ +vEI5YQ== +=/V/G +-----END PGP PUBLIC KEY BLOCK----- diff -Nru colord-1.3.2/debian/watch colord-1.3.3/debian/watch --- colord-1.3.2/debian/watch 2016-04-20 21:06:56.000000000 +0000 +++ colord-1.3.3/debian/watch 2016-09-06 06:46:05.000000000 +0000 @@ -2,4 +2,4 @@ version=3 # 1.1 is a development branch; only notify of stable 1.0 releases until 1.2 -opts="uversionmangle=s/^1.1/0.0/" http://www.freedesktop.org/software/colord/releases/colord-([\d\.]+)\.tar\.xz +opts="uversionmangle=s/^1.1/0.0/, pgpmode=auto" http://www.freedesktop.org/software/colord/releases/colord-([\d\.]+)\.tar\.xz diff -Nru colord-1.3.2/doc/api/html/CdEdid.html colord-1.3.3/doc/api/html/CdEdid.html --- colord-1.3.2/doc/api/html/CdEdid.html 2016-03-21 11:48:32.000000000 +0000 +++ colord-1.3.3/doc/api/html/CdEdid.html 2016-07-27 13:05:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -42,7 +42,7 @@ -GQuark +GQuark cd_edid_error_quark () @@ -66,49 +66,49 @@ -gboolean +gboolean cd_edid_parse () -const gchar * +const gchar * cd_edid_get_monitor_name () -const gchar * +const gchar * cd_edid_get_vendor_name () -const gchar * +const gchar * cd_edid_get_serial_number () -const gchar * +const gchar * cd_edid_get_eisa_id () -const gchar * +const gchar * cd_edid_get_checksum () -const gchar * +const gchar * cd_edid_get_pnp_id () @@ -116,7 +116,7 @@ -guint +guint cd_edid_get_width () @@ -124,7 +124,7 @@ -guint +guint cd_edid_get_height () @@ -132,7 +132,7 @@ -gdouble +gdouble cd_edid_get_gamma () @@ -184,7 +184,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── CdEdid
@@ -197,12 +197,12 @@

Functions

cd_edid_error_quark ()

-
GQuark
+
GQuark
 cd_edid_error_quark (void);

 
Gets the CdEdid error quark.

 

 
Returns

-
 a GQuark

+
 a GQuark

 

 
Since: 1.1.2
@@ -244,10 +244,10 @@

cd_edid_parse ()

-
gboolean
+
gboolean
 cd_edid_parse (CdEdid *edid,
-               GBytes *edid_data,
-               GError **error);

+               GBytes *edid_data,
+               GError **error);

Parses the EDID.

Parameters

@@ -270,7 +270,7 @@

error

-

A GError, or NULL

+

A GError, or NULL

  @@ -278,14 +278,14 @@

Returns

-

TRUE for success

+

TRUE for success

Since: 1.1.2

cd_edid_get_monitor_name ()

-
const gchar *
+
const gchar *
 cd_edid_get_monitor_name (CdEdid *edid);

 
Gets the EDID monitor name.

 

@@ -312,7 +312,7 @@
 

 

 
cd_edid_get_vendor_name ()

-
const gchar *
+
const gchar *
 cd_edid_get_vendor_name (CdEdid *edid);

 
Gets the EDID vendor name.

 

@@ -339,7 +339,7 @@
 

 

 
cd_edid_get_serial_number ()

-
const gchar *
+
const gchar *
 cd_edid_get_serial_number (CdEdid *edid);

 
Gets the EDID serial number.

 

@@ -366,7 +366,7 @@
 

 

 
cd_edid_get_eisa_id ()

-
const gchar *
+
const gchar *
 cd_edid_get_eisa_id (CdEdid *edid);

 
Gets the EDID EISA ID.

 

@@ -393,7 +393,7 @@
 

 

 
cd_edid_get_checksum ()

-
const gchar *
+
const gchar *
 cd_edid_get_checksum (CdEdid *edid);

 
Gets the EDID MD5 checksum.

 

@@ -420,7 +420,7 @@
 

 

 
cd_edid_get_pnp_id ()

-
const gchar *
+
const gchar *
 cd_edid_get_pnp_id (CdEdid *edid);

 
Gets the EDID PNP ID.

 

@@ -447,7 +447,7 @@
 

 

 
cd_edid_get_width ()

-
guint
+
guint
 cd_edid_get_width (CdEdid *edid);

 
Gets the panel width in inches.

 

@@ -474,7 +474,7 @@
 

 

 
cd_edid_get_height ()

-
guint
+
guint
 cd_edid_get_height (CdEdid *edid);

 
Gets the panel height in inches.

 

@@ -501,7 +501,7 @@
 

 

 
cd_edid_get_gamma ()

-
gdouble
+
gdouble
 cd_edid_get_gamma (CdEdid *edid);

 
Gets the native panel gamma.

 

@@ -548,7 +548,7 @@
 

 

 
Returns

-
 TRUE for success

+
 TRUE for success

 

 
Since: 1.1.2

 

@@ -646,6 +646,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/CdIccStore.html colord-1.3.3/doc/api/html/CdIccStore.html
--- colord-1.3.2/doc/api/html/CdIccStore.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/CdIccStore.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -51,7 +51,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_store_search_location ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_store_search_kind ()
@@ -91,7 +91,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_icc_store_get_all ()
@@ -128,12 +128,12 @@
 
 void
 added
-Run Last
+Run Last
 
 
 void
 removed
-Run Last
+Run Last
 
 
 

@@ -159,7 +159,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── CdIccStore
 

 

@@ -182,12 +182,12 @@
 

 

 
cd_icc_store_search_location ()

-
gboolean
+
gboolean
 cd_icc_store_search_location (CdIccStore *store,
-                              const gchar *location,
+                              const gchar *location,
                               CdIccStoreSearchFlags search_flags,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

 
Adds a location to be watched for ICC profiles

 

 
Parameters

@@ -215,12 +215,12 @@
 
 
 
cancellable

-
A GCancellable or NULL

+
A GCancellable or NULL

  
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -228,19 +228,19 @@
 

 

 
Returns

-
 TRUE for success

+
 TRUE for success

 

 
Since: 1.0.2

 

 

 

 
cd_icc_store_search_kind ()

-
gboolean
+
gboolean
 cd_icc_store_search_kind (CdIccStore *store,
                           CdIccStoreSearchKind search_kind,
                           CdIccStoreSearchFlags search_flags,
-                          GCancellable *cancellable,
-                          GError **error);

+                          GCancellable *cancellable,
+                          GError **error);

 
Adds a location to be watched for ICC profiles

 

 
Parameters

@@ -268,12 +268,12 @@
 
 
 
cancellable

-
A GCancellable or NULL

+
A GCancellable or NULL

  
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -281,7 +281,7 @@
 

 

 
Returns

-
 TRUE for success

+
 TRUE for success

 

 
Since: 1.0.2

 

@@ -348,7 +348,7 @@
 
cd_icc_store_set_cache ()

 
void
 cd_icc_store_set_cache (CdIccStore *store,
-                        GResource *cache);

+                        GResource *cache);

 
Sets an optional cache to use when reading profiles. This is probably
 only useful to the colord daemon. This function can only be called once.

 

@@ -367,7 +367,7 @@
 
 
 
cache

-
a GResource

+
a GResource

  
 
 
@@ -378,7 +378,7 @@
 

 

 
cd_icc_store_get_all ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_store_get_all (CdIccStore *store);

 
Gets the list of CdIcc objects in the store

 

@@ -408,7 +408,7 @@
 
cd_icc_store_find_by_filename ()

 
CdIcc *
 cd_icc_store_find_by_filename (CdIccStore *store,
-                               const gchar *filename);

+                               const gchar *filename);

 
Finds a ICC object in the store by filename.

 

 
Parameters

@@ -434,7 +434,7 @@
 

 

 
Returns

-
 an ICC profile object or NULL. 

+
 an ICC profile object or NULL. 

 
[transfer full]

 

 
Since: 1.0.2

@@ -444,7 +444,7 @@
 
cd_icc_store_find_by_checksum ()

 
CdIcc *
 cd_icc_store_find_by_checksum (CdIccStore *store,
-                               const gchar *checksum);

+                               const gchar *checksum);

 
Finds a ICC object in the store by checksum.

 

 
Parameters

@@ -470,7 +470,7 @@
 

 

 
Returns

-
 an ICC profile object or NULL. 

+
 an ICC profile object or NULL. 

 
[transfer full]

 

 
Since: 1.0.2

@@ -556,8 +556,8 @@
 
void
 user_function (CdIccStore *profile,
                CdIcc      *icc,
-               gpointer    user_data)

-
Flags: Run Last

+               gpointer    user_data)

+
Flags: Run Last

 
Since: 1.0.2

 

 

@@ -566,13 +566,13 @@
 
void
 user_function (CdIccStore *profile,
                CdIcc      *icc,
-               gpointer    user_data)

-
Flags: Run Last

+               gpointer    user_data)

+
Flags: Run Last

 
Since: 1.0.2

 

 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-client.html colord-1.3.3/doc/api/html/colord-cd-client.html
--- colord-1.3.2/doc/api/html/colord-cd-client.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-client.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-GQuark
+GQuark
 
 
 cd_client_error_quark ()
@@ -65,7 +65,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_connect_finish ()
@@ -145,7 +145,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_delete_device_finish ()
@@ -161,7 +161,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_delete_profile_finish ()
@@ -257,7 +257,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_devices_finish ()
@@ -273,7 +273,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_devices_by_kind_finish ()
@@ -289,7 +289,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_profiles_finish ()
@@ -305,7 +305,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_sensors_finish ()
@@ -345,7 +345,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_get_connected ()
@@ -353,28 +353,28 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_get_has_server ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_client_get_daemon_version ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_client_get_system_vendor ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_client_get_system_model ()
@@ -412,7 +412,7 @@
 
Functions

 

 
cd_client_error_quark ()

-
GQuark
+
GQuark
 cd_client_error_quark (void);

 

 
Returns

@@ -437,9 +437,9 @@
 
cd_client_connect ()

 
void
 cd_client_connect (CdClient *client,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);

+                   GCancellable *cancellable,
+                   GAsyncReadyCallback callback,
+                   gpointer user_data);

 
Connects to the colord daemon.

 

 
Parameters

@@ -457,7 +457,7 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
@@ -479,10 +479,10 @@
 

 

 
cd_client_connect_finish ()

-
gboolean
+
gboolean
 cd_client_connect_finish (CdClient *client,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -500,12 +500,12 @@
 
 
 
res

-
the GAsyncResult

+
the GAsyncResult

  
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -522,12 +522,12 @@
 
cd_client_create_device ()

 
void
 cd_client_create_device (CdClient *client,
-                         const gchar *id,
+                         const gchar *id,
                          CdObjectScope scope,
-                         GHashTable *properties,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);

+                         GHashTable *properties,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);

Creates a color device.

Parameters

@@ -556,12 +556,12 @@

properties

properties to -set on the device, or NULL.

+set on the device, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -585,8 +585,8 @@

cd_client_create_device_finish ()

CdDevice *
 cd_client_create_device_finish (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -604,12 +604,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -617,7 +617,7 @@

Returns

-

a CdDevice or NULL.

+

a CdDevice or NULL.

[transfer full]

Since: 0.1.8

@@ -627,12 +627,12 @@

cd_client_create_profile ()

void
 cd_client_create_profile (CdClient *client,
-                          const gchar *id,
+                          const gchar *id,
                           CdObjectScope scope,
-                          GHashTable *properties,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GHashTable *properties, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Creates a color profile.

Parameters

@@ -661,12 +661,12 @@

properties

properties to -set on the profile, or NULL.

+set on the profile, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -690,8 +690,8 @@

cd_client_create_profile_finish ()

CdProfile *
 cd_client_create_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -709,12 +709,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -722,7 +722,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.8

@@ -734,9 +734,9 @@ cd_client_create_profile_for_icc (CdClient *client, CdIcc *icc, CdObjectScope scope, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Creates a color profile for an CdIcc Object.

Parameters

@@ -764,7 +764,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -789,8 +789,8 @@ 
CdProfile *
 cd_client_create_profile_for_icc_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -808,12 +808,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -821,7 +821,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 1.1.1

@@ -831,10 +831,10 @@

cd_client_import_profile ()

void
 cd_client_import_profile (CdClient *client,
-                          GFile *file,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GFile *file, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Imports a color profile into the users home directory.

If the profile should be accessable for all users, then call cd_profile_install_system_wide() on the result.

@@ -854,12 +854,12 @@

file

-

a GFile

+

a GFile

 

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -883,8 +883,8 @@

cd_client_import_profile_finish ()

CdProfile *
 cd_client_import_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -902,12 +902,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -915,7 +915,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.12

@@ -926,9 +926,9 @@ 
void
 cd_client_delete_device (CdClient *client,
                          CdDevice *device,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Deletes a device.

Parameters

@@ -951,7 +951,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -973,10 +973,10 @@

cd_client_delete_device_finish ()

-
gboolean
+
gboolean
 cd_client_delete_device_finish (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);

+                                GAsyncResult *res,
+                                GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -994,12 +994,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1017,9 +1017,9 @@ 
void
 cd_client_delete_profile (CdClient *client,
                           CdProfile *profile,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Deletes a profile.

Parameters

@@ -1042,7 +1042,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1064,10 +1064,10 @@

cd_client_delete_profile_finish ()

-
gboolean
+
gboolean
 cd_client_delete_profile_finish (CdClient *client,
-                                 GAsyncResult *res,
-                                 GError **error);

+                                 GAsyncResult *res,
+                                 GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1085,12 +1085,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1107,10 +1107,10 @@

cd_client_find_device ()

void
 cd_client_find_device (CdClient *client,
-                       const gchar *id,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a device by an ID.

Parameters

@@ -1133,7 +1133,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1157,8 +1157,8 @@

cd_client_find_device_finish ()

CdDevice *
 cd_client_find_device_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1176,12 +1176,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1189,7 +1189,7 @@

Returns

-

a CdDevice or NULL.

+

a CdDevice or NULL.

[transfer full]

Since: 0.1.8

@@ -1199,11 +1199,11 @@

cd_client_find_device_by_property ()

void
 cd_client_find_device_by_property (CdClient *client,
-                                   const gchar *key,
-                                   const gchar *value,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a color device that has a property value.

Parameters

@@ -1231,7 +1231,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1256,8 +1256,8 @@ 
CdDevice *
 cd_client_find_device_by_property_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1275,12 +1275,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1288,7 +1288,7 @@

Returns

-

a CdDevice or NULL.

+

a CdDevice or NULL.

[transfer full]

Since: 0.1.8

@@ -1298,10 +1298,10 @@

cd_client_find_profile ()

void
 cd_client_find_profile (CdClient *client,
-                        const gchar *id,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a profile by an ID.

Parameters

@@ -1324,7 +1324,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1348,8 +1348,8 @@

cd_client_find_profile_finish ()

CdProfile *
 cd_client_find_profile_finish (CdClient *client,
-                               GAsyncResult *res,
-                               GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1367,12 +1367,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1380,7 +1380,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.8

@@ -1390,10 +1390,10 @@

cd_client_find_profile_by_filename ()

void
 cd_client_find_profile_by_filename (CdClient *client,
-                                    const gchar *filename,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
+ const gchar *filename, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a profile by a filename.

Parameters

@@ -1416,7 +1416,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1441,8 +1441,8 @@ 
CdProfile *
 cd_client_find_profile_by_filename_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1460,12 +1460,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1473,7 +1473,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.8

@@ -1484,9 +1484,9 @@ 
void
 cd_client_get_standard_space (CdClient *client,
                               CdStandardSpace standard_space,
-                              GCancellable *cancellable,
-                              GAsyncReadyCallback callback,
-                              gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a standard profile space.

Parameters

@@ -1509,7 +1509,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1533,8 +1533,8 @@

cd_client_get_standard_space_finish ()

CdProfile *
 cd_client_get_standard_space_finish (CdClient *client,
-                                     GAsyncResult *res,
-                                     GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1552,12 +1552,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1565,7 +1565,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.8

@@ -1575,9 +1575,9 @@

cd_client_get_devices ()

void
 cd_client_get_devices (CdClient *client,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color devices.

Parameters

@@ -1595,7 +1595,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1617,10 +1617,10 @@

cd_client_get_devices_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1638,12 +1638,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1662,9 +1662,9 @@ 
void
 cd_client_get_devices_by_kind (CdClient *client,
                                CdDeviceKind kind,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color devices.

Parameters

@@ -1687,7 +1687,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1709,10 +1709,10 @@

cd_client_get_devices_by_kind_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_by_kind_finish (CdClient *client,
-                                      GAsyncResult *res,
-                                      GError **error);

+                                      GAsyncResult *res,
+                                      GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1730,12 +1730,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1753,9 +1753,9 @@

cd_client_get_profiles ()

void
 cd_client_get_profiles (CdClient *client,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color profiles.

Parameters

@@ -1773,7 +1773,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1795,10 +1795,10 @@

cd_client_get_profiles_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_profiles_finish (CdClient *client,
-                               GAsyncResult *res,
-                               GError **error);

+                               GAsyncResult *res,
+                               GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1816,12 +1816,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1839,9 +1839,9 @@

cd_client_get_sensors ()

void
 cd_client_get_sensors (CdClient *client,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets an array of color sensors.

Parameters

@@ -1859,7 +1859,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1881,10 +1881,10 @@

cd_client_get_sensors_finish ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_sensors_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1902,12 +1902,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1925,11 +1925,11 @@

cd_client_find_profile_by_property ()

void
 cd_client_find_profile_by_property (CdClient *client,
-                                    const gchar *key,
-                                    const gchar *value,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a color profile that has a property value.

Parameters

@@ -1957,7 +1957,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1982,8 +1982,8 @@ 
CdProfile *
 cd_client_find_profile_by_property_finish
                                (CdClient *client,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -2001,12 +2001,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -2014,7 +2014,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.24

@@ -2024,10 +2024,10 @@

cd_client_find_sensor ()

void
 cd_client_find_sensor (CdClient *client,
-                       const gchar *id,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Finds a sensor by an ID.

Parameters

@@ -2050,7 +2050,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -2074,8 +2074,8 @@

cd_client_find_sensor_finish ()

CdSensor *
 cd_client_find_sensor_finish (CdClient *client,
-                              GAsyncResult *res,
-                              GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -2093,12 +2093,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -2106,7 +2106,7 @@

Returns

-

a CdSensor or NULL.

+

a CdSensor or NULL.

[transfer full]

Since: 0.1.26

@@ -2114,7 +2114,7 @@

cd_client_get_connected ()

-
gboolean
+
gboolean
 cd_client_get_connected (CdClient *client);

 
Gets if the client has been connected.

 

@@ -2134,14 +2134,14 @@
 

 

 
Returns

-
 TRUE if properties are valid

+
 TRUE if properties are valid

 

 
Since: 0.1.9

cd_client_get_has_server ()

-
gboolean
+
gboolean
 cd_client_get_has_server (CdClient *client);

 
Gets if the colord server is currently running.
 WARNING: This function may block for up to 5 seconds waiting for the daemon
@@ -2163,14 +2163,14 @@

Returns

-

TRUE if the colord process is running

+

TRUE if the colord process is running

Since: 0.1.12

cd_client_get_daemon_version ()

-
const gchar *
+
const gchar *
 cd_client_get_daemon_version (CdClient *client);

 
Get colord daemon version.

 

@@ -2197,7 +2197,7 @@
 

 

 
cd_client_get_system_vendor ()

-
const gchar *
+
const gchar *
 cd_client_get_system_vendor (CdClient *client);

 
Get system vendor.

 

@@ -2224,7 +2224,7 @@
 

 

 
cd_client_get_system_model ()

-
const gchar *
+
const gchar *
 cd_client_get_system_model (CdClient *client);

 
Get system model.

 

@@ -2269,6 +2269,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-client-sync.html colord-1.3.3/doc/api/html/colord-cd-client-sync.html
--- colord-1.3.2/doc/api/html/colord-cd-client-sync.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-client-sync.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_connect_sync ()
@@ -49,7 +49,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_delete_profile_sync ()
@@ -57,7 +57,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_client_delete_device_sync ()
@@ -113,7 +113,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_devices_sync ()
@@ -121,7 +121,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_profiles_sync ()
@@ -129,7 +129,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_sensors_sync ()
@@ -161,7 +161,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_client_get_devices_by_kind_sync ()
@@ -196,10 +196,10 @@
 
Functions

 

 
cd_client_connect_sync ()

-
gboolean
+
gboolean
 cd_client_connect_sync (CdClient *client,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

 
Connects to the colord daemon.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -219,12 +219,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -232,18 +232,18 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.0

 

 

 

 
cd_client_delete_profile_sync ()

-
gboolean
+
gboolean
 cd_client_delete_profile_sync (CdClient *client,
                                CdProfile *profile,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

 
Deletes a color profile.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -268,12 +268,12 @@
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
a GError, or NULL

+
a GError, or NULL

  
 
 
@@ -281,18 +281,18 @@
 

 

 
Returns

-
 TRUE is the profile was deleted

+
 TRUE is the profile was deleted

 

 
Since: 0.1.8

 

 

 

 
cd_client_delete_device_sync ()

-
gboolean
+
gboolean
 cd_client_delete_device_sync (CdClient *client,
                               CdDevice *device,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

 
Deletes a color device.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -317,12 +317,12 @@
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
a GError, or NULL

+
a GError, or NULL

  
 
 
@@ -330,7 +330,7 @@
 

 

 
Returns

-
 TRUE is the device was deleted

+
 TRUE is the device was deleted

 

 
Since: 0.1.8
@@ -339,9 +339,9 @@

cd_client_find_profile_sync ()

CdProfile *
 cd_client_find_profile_sync (CdClient *client,
-                             const gchar *id,
-                             GCancellable *cancellable,
-                             GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color profile from its id.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -366,12 +366,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -379,7 +379,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.0

@@ -390,9 +390,9 @@ 
CdProfile *
 cd_client_find_profile_by_filename_sync
                                (CdClient *client,
-                                const gchar *filename,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *filename, + GCancellable *cancellable, + GError **error);

Finds a color profile from its filename.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -417,12 +417,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -430,7 +430,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.3

@@ -440,11 +440,11 @@

cd_client_create_profile_sync ()

CdProfile *
 cd_client_create_profile_sync (CdClient *client,
-                               const gchar *id,
+                               const gchar *id,
                                CdObjectScope scope,
-                               GHashTable *properties,
-                               GCancellable *cancellable,
-                               GError **error);
+ GHashTable *properties, + GCancellable *cancellable, + GError **error);

Creates a color profile.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -475,17 +475,17 @@

properties

properties to -set on the profile, or NULL.

+set on the profile, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -493,7 +493,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.2

@@ -505,8 +505,8 @@ cd_client_create_profile_for_icc_sync (CdClient *client, CdIcc *icc, CdObjectScope scope, - GCancellable *cancellable, - GError **error); + GCancellable *cancellable, + GError **error);

Creates a color profile from a CdIcc object.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -536,12 +536,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -549,7 +549,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 1.1.1

@@ -559,9 +559,9 @@

cd_client_import_profile_sync ()

CdProfile *
 cd_client_import_profile_sync (CdClient *client,
-                               GFile *file,
-                               GCancellable *cancellable,
-                               GError **error);
+ GFile *file, + GCancellable *cancellable, + GError **error);

Imports a color profile into the users home directory.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -581,17 +581,17 @@

file

-

A GFile

+

A GFile

 

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -599,7 +599,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.12

@@ -609,11 +609,11 @@

cd_client_create_device_sync ()

CdDevice *
 cd_client_create_device_sync (CdClient *client,
-                              const gchar *id,
+                              const gchar *id,
                               CdObjectScope scope,
-                              GHashTable *properties,
-                              GCancellable *cancellable,
-                              GError **error);
+ GHashTable *properties, + GCancellable *cancellable, + GError **error);

Creates a color device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -644,17 +644,17 @@

properties

properties to -set on the device, or NULL.

+set on the device, or NULL.

[element-type utf8 utf8][allow-none]

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -662,7 +662,7 @@

Returns

-

A CdDevice object, or NULL for error.

+

A CdDevice object, or NULL for error.

[transfer full]

Since: 0.1.2

@@ -670,10 +670,10 @@

cd_client_get_devices_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_sync (CdClient *client,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

Get an array of the device objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -693,12 +693,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -715,10 +715,10 @@

cd_client_get_profiles_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_profiles_sync (CdClient *client,
-                             GCancellable *cancellable,
-                             GError **error);

+                             GCancellable *cancellable,
+                             GError **error);

Get an array of the profile objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -738,12 +738,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -760,10 +760,10 @@

cd_client_get_sensors_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_sensors_sync (CdClient *client,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

Get an array of the sensor objects.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -783,12 +783,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -807,9 +807,9 @@

cd_client_find_device_sync ()

CdDevice *
 cd_client_find_device_sync (CdClient *client,
-                            const gchar *id,
-                            GCancellable *cancellable,
-                            GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -834,12 +834,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -847,7 +847,7 @@

Returns

-

A CdDevice object, or NULL for error.

+

A CdDevice object, or NULL for error.

[transfer full]

Since: 0.1.0

@@ -858,10 +858,10 @@ 
CdDevice *
 cd_client_find_device_by_property_sync
                                (CdClient *client,
-                                const gchar *key,
-                                const gchar *value,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GError **error);

Finds a color device that has a property value.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -891,12 +891,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -904,7 +904,7 @@

Returns

-

A CdDevice object, or NULL for error.

+

A CdDevice object, or NULL for error.

[transfer full]

Since: 0.1.8

@@ -915,8 +915,8 @@ 
CdProfile *
 cd_client_get_standard_space_sync (CdClient *client,
                                    CdStandardSpace standard_space,
-                                   GCancellable *cancellable,
-                                   GError **error);
+ GCancellable *cancellable, + GError **error);

Finds a standard colorspace.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -941,12 +941,12 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

 

error

-

a GError, or NULL

+

a GError, or NULL

  @@ -954,7 +954,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.2

@@ -962,11 +962,11 @@

cd_client_get_devices_by_kind_sync ()

-
GPtrArray *
+
GPtrArray *
 cd_client_get_devices_by_kind_sync (CdClient *client,
                                     CdDeviceKind kind,
-                                    GCancellable *cancellable,
-                                    GError **error);

+                                    GCancellable *cancellable,
+                                    GError **error);

Get an array of the device objects of a specified kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -991,12 +991,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -1016,10 +1016,10 @@ 
CdProfile *
 cd_client_find_profile_by_property_sync
                                (CdClient *client,
-                                const gchar *key,
-                                const gchar *value,
-                                GCancellable *cancellable,
-                                GError **error);
+ const gchar *key, + const gchar *value, + GCancellable *cancellable, + GError **error);

Finds a color profile that has a property value.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -1049,12 +1049,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -1062,7 +1062,7 @@

Returns

-

A CdProfile object, or NULL for error.

+

A CdProfile object, or NULL for error.

[transfer full]

Since: 0.1.24

@@ -1072,9 +1072,9 @@

cd_client_find_sensor_sync ()

CdSensor *
 cd_client_find_sensor_sync (CdClient *client,
-                            const gchar *id,
-                            GCancellable *cancellable,
-                            GError **error);
+ const gchar *id, + GCancellable *cancellable, + GError **error);

Finds a color sensor.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -1099,12 +1099,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -1112,7 +1112,7 @@

Returns

-

A CdSensor object, or NULL for error.

+

A CdSensor object, or NULL for error.

[transfer full]

Since: 0.1.26

@@ -1123,6 +1123,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff -Nru colord-1.3.2/doc/api/html/colord-cd-color.html colord-1.3.3/doc/api/html/colord-cd-color.html --- colord-1.3.2/doc/api/html/colord-cd-color.html 2016-03-21 11:48:32.000000000 +0000 +++ colord-1.3.3/doc/api/html/colord-cd-color.html 2016-07-27 13:05:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ -const gchar * +const gchar * cd_color_swatch_get_name () @@ -288,7 +288,7 @@ -gdouble +gdouble cd_color_lab_delta_e76 () @@ -368,7 +368,7 @@ -gdouble +gdouble cd_color_uvw_get_chroma_difference () @@ -376,7 +376,7 @@ -gboolean +gboolean cd_color_get_blackbody_rgb () @@ -392,7 +392,7 @@ -gdouble +gdouble cd_color_xyz_to_cct () @@ -408,7 +408,7 @@ -GPtrArray * +GPtrArray * cd_color_rgb_array_new () @@ -416,7 +416,7 @@ -gboolean +gboolean cd_color_rgb_array_is_monotonic () @@ -424,7 +424,7 @@ -GPtrArray * +GPtrArray * cd_color_rgb_array_interpolate () @@ -465,7 +465,7 @@

Functions

cd_color_swatch_get_name ()

-
const gchar *
+
const gchar *
 cd_color_swatch_get_name (const CdColorSwatch *swatch);

 
Since: 0.1.32
@@ -733,9 +733,9 @@

cd_color_xyz_set ()

void
 cd_color_xyz_set (CdColorXYZ *dest,
-                  gdouble X,
-                  gdouble Y,
-                  gdouble Z);
+ gdouble X, + gdouble Y, + gdouble Z);

Initialises a color value.

Parameters

@@ -776,9 +776,9 @@

cd_color_rgb_set ()

void
 cd_color_rgb_set (CdColorRGB *dest,
-                  gdouble R,
-                  gdouble G,
-                  gdouble B);
+ gdouble R, + gdouble G, + gdouble B);

Initialises a color value.

Parameters

@@ -819,9 +819,9 @@

cd_color_lab_set ()

void
 cd_color_lab_set (CdColorLab *dest,
-                  gdouble L,
-                  gdouble a,
-                  gdouble b);
+ gdouble L, + gdouble a, + gdouble b);

Initialises a color value.

Parameters

@@ -862,9 +862,9 @@

cd_color_yxy_set ()

void
 cd_color_yxy_set (CdColorYxy *dest,
-                  gdouble Y,
-                  gdouble x,
-                  gdouble y);
+ gdouble Y, + gdouble x, + gdouble y);

Initialises a color value.

Parameters

@@ -905,9 +905,9 @@

cd_color_uvw_set ()

void
 cd_color_uvw_set (CdColorUVW *dest,
-                  gdouble U,
-                  gdouble V,
-                  gdouble W);
+ gdouble U, + gdouble V, + gdouble W);

Initialises a color value.

Parameters

@@ -948,7 +948,7 @@

cd_color_swatch_set_name ()

void
 cd_color_swatch_set_name (CdColorSwatch *dest,
-                          const gchar *name);
+ const gchar *name);

Initialises a swatch name.

Parameters

@@ -1132,7 +1132,7 @@

cd_color_lab_delta_e76 ()

-
gdouble
+
gdouble
 cd_color_lab_delta_e76 (const CdColorLab *p1,
                         const CdColorLab *p2);

 
Calculates the ΔE of two colors using the 1976 formula.

@@ -1415,7 +1415,7 @@
 
cd_color_uvw_set_planckian_locus ()

 
void
 cd_color_uvw_set_planckian_locus (CdColorUVW *dest,
-                                  gdouble temp);

+                                  gdouble temp);

Sets the CIEUVW color from a Planckian locus of specific temperature.

Parameters

@@ -1444,7 +1444,7 @@

cd_color_uvw_get_chroma_difference ()

-
gdouble
+
gdouble
 cd_color_uvw_get_chroma_difference (const CdColorUVW *p1,
                                     const CdColorUVW *p2);

 
Gets the chromaticity distance in the CIE 1960 UCS.

@@ -1479,8 +1479,8 @@
 

 

 
cd_color_get_blackbody_rgb ()

-
gboolean
-cd_color_get_blackbody_rgb (guint temp,
+
gboolean
+cd_color_get_blackbody_rgb (guint temp,
                             CdColorRGB *result);

 
Get the blackbody color for a specific temperature. If the temperature
 range is outside 1000K to 10000K then the result is clipped.

@@ -1519,14 +1519,14 @@
 
void
 cd_color_rgb_interpolate (const CdColorRGB *p1,
                           const CdColorRGB *p2,
-                          gdouble index,
+                          gdouble index,
                           CdColorRGB *result);

 
Since: 0.1.26

 

 

 

 
cd_color_xyz_to_cct ()

-
gdouble
+
gdouble
 cd_color_xyz_to_cct (const CdColorXYZ *src);

 
Gets the correlated color temperature for the XYZ value.

 

@@ -1551,7 +1551,7 @@
 
cd_color_xyz_normalize ()

 
void
 cd_color_xyz_normalize (const CdColorXYZ *src,
-                        gdouble max,
+                        gdouble max,
                         CdColorXYZ *dest);

 
Normalizes src
  to y=1.0

@@ -1582,7 +1582,7 @@
 

 

 
cd_color_rgb_array_new ()

-
GPtrArray *
+
GPtrArray *
 cd_color_rgb_array_new (void);

 
Creates a new RGB array.

 

@@ -1595,8 +1595,8 @@
 

 

 
cd_color_rgb_array_is_monotonic ()

-
gboolean
-cd_color_rgb_array_is_monotonic (const GPtrArray *array);

+
gboolean
+cd_color_rgb_array_is_monotonic (const GPtrArray *array);

 
Checks the array for monotonicity.

 

 
Parameters

@@ -1615,16 +1615,16 @@
 

 

 
Returns

-
 TRUE if the array is monotonic

+
 TRUE if the array is monotonic

 

 
Since: 0.1.31

 

 

 

 
cd_color_rgb_array_interpolate ()

-
GPtrArray *
-cd_color_rgb_array_interpolate (const GPtrArray *array,
-                                guint new_length);

+
GPtrArray *
+cd_color_rgb_array_interpolate (const GPtrArray *array,
+                                guint new_length);

 
Interpolate the RGB array to a different size.
 This uses the Akima interpolation algorithm unless the array would become
 non-monotonic, in which case it falls back to linear interpolation.

@@ -1653,7 +1653,7 @@
 

 
Returns

 
 An array of size new_length
-or NULL. 

+or NULL. 

 
[element-type CdColorRGB][transfer full]

 

 
Since: 0.1.31

@@ -1675,6 +1675,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-device.html colord-1.3.3/doc/api/html/colord-cd-device.html
--- colord-1.3.2/doc/api/html/colord-cd-device.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-device.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-GQuark
+GQuark
 
 
 cd_device_error_quark ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_connect_finish ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_property_finish ()
@@ -105,7 +105,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_add_profile_finish ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_remove_profile_finish ()
@@ -137,7 +137,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_make_profile_default_finish ()
@@ -153,7 +153,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_profiling_inhibit_finish ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_enabled_finish ()
@@ -185,7 +185,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_profiling_uninhibit_finish ()
@@ -224,49 +224,49 @@
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_id ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_model ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_vendor ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_serial ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_seat ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_format ()
 
 
 
-const gchar **
+const gchar **
 
 
 cd_device_get_profiling_inhibitors ()
@@ -274,7 +274,7 @@
 
 
 
-guint64
+guint64
 
 
 cd_device_get_created ()
@@ -282,7 +282,7 @@
 
 
 
-guint64
+guint64
 
 
 cd_device_get_modified ()
@@ -314,7 +314,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_get_enabled ()
@@ -322,7 +322,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_get_embedded ()
@@ -338,7 +338,7 @@
 
 
 
-guint
+guint
 
 
 cd_device_get_owner ()
@@ -346,7 +346,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_device_get_profiles ()
@@ -361,7 +361,7 @@
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_object_path ()
@@ -369,14 +369,14 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 cd_device_get_metadata ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_device_get_metadata_item ()
@@ -392,7 +392,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_get_connected ()
@@ -400,7 +400,7 @@
 
 
 
-gchar *
+gchar *
 
 
 cd_device_to_string ()
@@ -408,7 +408,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_equal ()
@@ -446,7 +446,7 @@
 
Functions

 

 
cd_device_error_quark ()

-
GQuark
+
GQuark
 cd_device_error_quark (void);

 

 
Returns

@@ -470,7 +470,7 @@
 

 
cd_device_new_with_object_path ()

 
CdDevice *
-cd_device_new_with_object_path (const gchar *object_path);

+cd_device_new_with_object_path (const gchar *object_path);

 
Creates a new CdDevice object with a known object path.

 

 
Parameters

@@ -498,9 +498,9 @@
 
cd_device_connect ()

 
void
 cd_device_connect (CdDevice *device,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);

+                   GCancellable *cancellable,
+                   GAsyncReadyCallback callback,
+                   gpointer user_data);

 
Connects to the object and fills up initial properties.

 

 
Parameters

@@ -518,7 +518,7 @@
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -540,10 +540,10 @@
 

 

 
cd_device_connect_finish ()

-
gboolean
+
gboolean
 cd_device_connect_finish (CdDevice *device,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -561,12 +561,12 @@
 
 
 
res

-
the GAsyncResult

+
the GAsyncResult

  
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -583,11 +583,11 @@
 
cd_device_set_property ()

 
void
 cd_device_set_property (CdDevice *device,
-                        const gchar *key,
-                        const gchar *value,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);

+                        const gchar *key,
+                        const gchar *value,
+                        GCancellable *cancellable,
+                        GAsyncReadyCallback callback,
+                        gpointer user_data);

Sets a property on the device.

Parameters

@@ -615,7 +615,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -637,10 +637,10 @@

cd_device_set_property_finish ()

-
gboolean
+
gboolean
 cd_device_set_property_finish (CdDevice *device,
-                               GAsyncResult *res,
-                               GError **error);

+                               GAsyncResult *res,
+                               GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -658,12 +658,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -682,9 +682,9 @@ cd_device_add_profile (CdDevice *device, CdDeviceRelation relation, CdProfile *profile, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Adds a profile to a device.

Parameters

@@ -712,7 +712,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -734,10 +734,10 @@

cd_device_add_profile_finish ()

-
gboolean
+
gboolean
 cd_device_add_profile_finish (CdDevice *device,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -755,12 +755,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -778,9 +778,9 @@ 
void
 cd_device_remove_profile (CdDevice *device,
                           CdProfile *profile,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Removes a profile from a device.

Parameters

@@ -803,7 +803,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -825,10 +825,10 @@

cd_device_remove_profile_finish ()

-
gboolean
+
gboolean
 cd_device_remove_profile_finish (CdDevice *device,
-                                 GAsyncResult *res,
-                                 GError **error);

+                                 GAsyncResult *res,
+                                 GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -846,12 +846,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -869,9 +869,9 @@ 
void
 cd_device_make_profile_default (CdDevice *device,
                                 CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Makes an already added profile default for a device.

Parameters

@@ -894,7 +894,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -916,10 +916,10 @@

cd_device_make_profile_default_finish ()

-
gboolean
+
gboolean
 cd_device_make_profile_default_finish (CdDevice *device,
-                                       GAsyncResult *res,
-                                       GError **error);

+                                       GAsyncResult *res,
+                                       GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -937,12 +937,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -959,9 +959,9 @@

cd_device_profiling_inhibit ()

void
 cd_device_profiling_inhibit (CdDevice *device,
-                             GCancellable *cancellable,
-                             GAsyncReadyCallback callback,
-                             gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Sets up the device for profiling and causes no profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

@@ -980,7 +980,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1002,10 +1002,10 @@

cd_device_profiling_inhibit_finish ()

-
gboolean
+
gboolean
 cd_device_profiling_inhibit_finish (CdDevice *device,
-                                    GAsyncResult *res,
-                                    GError **error);

+                                    GAsyncResult *res,
+                                    GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1023,12 +1023,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1045,10 +1045,10 @@

cd_device_set_enabled ()

void
 cd_device_set_enabled (CdDevice *device,
-                       gboolean enabled,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);
+ gboolean enabled, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Enables or disables a device.

Parameters

@@ -1071,7 +1071,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1093,10 +1093,10 @@

cd_device_set_enabled_finish ()

-
gboolean
+
gboolean
 cd_device_set_enabled_finish (CdDevice *device,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1114,12 +1114,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1136,9 +1136,9 @@

cd_device_profiling_uninhibit ()

void
 cd_device_profiling_uninhibit (CdDevice *device,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Restores the device after profiling and causes normal profiles to be returned if cd_device_get_profile_for_qualifiers_sync() is used.

@@ -1157,7 +1157,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1179,10 +1179,10 @@

cd_device_profiling_uninhibit_finish ()

-
gboolean
+
gboolean
 cd_device_profiling_uninhibit_finish (CdDevice *device,
-                                      GAsyncResult *res,
-                                      GError **error);

+                                      GAsyncResult *res,
+                                      GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1200,12 +1200,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1222,10 +1222,10 @@

cd_device_get_profile_for_qualifiers ()

void
 cd_device_get_profile_for_qualifiers (CdDevice *device,
-                                      const gchar **qualifiers,
-                                      GCancellable *cancellable,
-                                      GAsyncReadyCallback callback,
-                                      gpointer user_data);
+ const gchar **qualifiers, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets the prefered profile for some qualifiers.

Parameters

@@ -1248,7 +1248,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1273,8 +1273,8 @@ 
CdProfile *
 cd_device_get_profile_for_qualifiers_finish
                                (CdDevice *device,
-                                GAsyncResult *res,
-                                GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1292,12 +1292,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1305,7 +1305,7 @@

Returns

-

a CdProfile or NULL.

+

a CdProfile or NULL.

[transfer full]

Since: 0.1.8

@@ -1316,9 +1316,9 @@ 
void
 cd_device_get_profile_relation (CdDevice *device,
                                 CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Gets the property relationship to the device.

Parameters

@@ -1341,7 +1341,7 @@

cancellable

-

a GCancellable, or NULL

+

a GCancellable, or NULL

  @@ -1365,8 +1365,8 @@

cd_device_get_profile_relation_finish ()

CdDeviceRelation
 cd_device_get_profile_relation_finish (CdDevice *device,
-                                       GAsyncResult *res,
-                                       GError **error);
+ GAsyncResult *res, + GError **error);

Gets the result from the asynchronous function.

Parameters

@@ -1384,12 +1384,12 @@

res

-

the GAsyncResult

+

the GAsyncResult

 

error

-

A GError or NULL

+

A GError or NULL

  @@ -1404,7 +1404,7 @@

cd_device_get_id ()

-
const gchar *
+
const gchar *
 cd_device_get_id (CdDevice *device);

 
Gets the device ID.

 

@@ -1424,14 +1424,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

cd_device_get_model ()

-
const gchar *
+
const gchar *
 cd_device_get_model (CdDevice *device);

 
Gets the device model.

 

@@ -1451,14 +1451,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

cd_device_get_vendor ()

-
const gchar *
+
const gchar *
 cd_device_get_vendor (CdDevice *device);

 
Gets the device vendor.

 

@@ -1478,14 +1478,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.1

cd_device_get_serial ()

-
const gchar *
+
const gchar *
 cd_device_get_serial (CdDevice *device);

 
Gets the device serial number.

 

@@ -1505,14 +1505,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

cd_device_get_seat ()

-
const gchar *
+
const gchar *
 cd_device_get_seat (CdDevice *device);

 
Gets the device seat identifier.

 

@@ -1532,14 +1532,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.24

cd_device_get_format ()

-
const gchar *
+
const gchar *
 cd_device_get_format (CdDevice *device);

 
Gets the device format.

 

@@ -1559,14 +1559,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.9

cd_device_get_profiling_inhibitors ()

-
const gchar **
+
const gchar **
 cd_device_get_profiling_inhibitors (CdDevice *device);

 
Gets any profiling inhibitors for the device.

 

@@ -1586,7 +1586,7 @@
 

 

 
Returns

-
 A strv, or NULL for invalid. 

+
 A strv, or NULL for invalid. 

 
[transfer none]

 

 
Since: 0.1.17

@@ -1594,7 +1594,7 @@
 

 

 
cd_device_get_created ()

-
guint64
+
guint64
 cd_device_get_created (CdDevice *device);

 
Gets the device creation date.

 

@@ -1621,7 +1621,7 @@
 

 

 
cd_device_get_modified ()

-
guint64
+
guint64
 cd_device_get_modified (CdDevice *device);

 
Gets the device modified date.

 

@@ -1729,7 +1729,7 @@
 

 

 
cd_device_get_enabled ()

-
gboolean
+
gboolean
 cd_device_get_enabled (CdDevice *device);

 
Gets the device enabled state.

 

@@ -1749,14 +1749,14 @@
 

 

 
Returns

-
 TRUE if the device is enabled

+
 TRUE if the device is enabled

 

 
Since: 0.1.26

 

 

 

 
cd_device_get_embedded ()

-
gboolean
+
gboolean
 cd_device_get_embedded (CdDevice *device);

 
Returns if the device is embedded in the computer and cannot be
 removed.

@@ -1777,7 +1777,7 @@
 

 

 
Returns

-
 TRUE if embedded.

+
 TRUE if embedded.

 

 
Since: 0.1.27

 

@@ -1811,7 +1811,7 @@
 

 

 
cd_device_get_owner ()

-
guint
+
guint
 cd_device_get_owner (CdDevice *device);

 
Gets the device owner.

 

@@ -1838,7 +1838,7 @@
 

 

 
cd_device_get_profiles ()

-
GPtrArray *
+
GPtrArray *
 cd_device_get_profiles (CdDevice *device);

 
Gets the device profiles.

 

@@ -1895,7 +1895,7 @@
 

 

 
cd_device_get_object_path ()

-
const gchar *
+
const gchar *
 cd_device_get_object_path (CdDevice *device);

 
Gets the object path for the device.

 

@@ -1915,14 +1915,14 @@
 

 

 
Returns

-
 the object path, or NULL

+
 the object path, or NULL

 

 
Since: 0.1.0

 

 

 

 
cd_device_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_device_get_metadata (CdDevice *device);

 
Returns the device metadata.

 

@@ -1943,7 +1943,7 @@
 

 
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

 
Since: 0.1.5

@@ -1951,9 +1951,9 @@
 

 

 
cd_device_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_device_get_metadata_item (CdDevice *device,
-                             const gchar *key);

+                             const gchar *key);

 
Returns the device metadata for a specific key.

 

 
Parameters

@@ -1979,7 +1979,7 @@
 

 

 
Returns

-
 the metadata value, or NULL if not set.

+
 the metadata value, or NULL if not set.

 

 
Since: 0.1.5

 

@@ -1988,7 +1988,7 @@
 
cd_device_set_object_path ()

 
void
 cd_device_set_object_path (CdDevice *device,
-                           const gchar *object_path);

+                           const gchar *object_path);

 
Sets the object path of the device.

 

 
Parameters

@@ -2017,7 +2017,7 @@
 

 

 
cd_device_get_connected ()

-
gboolean
+
gboolean
 cd_device_get_connected (CdDevice *device);

 
Gets if the device has been connected.

 

@@ -2037,14 +2037,14 @@
 

 

 
Returns

-
 TRUE if properties are valid

+
 TRUE if properties are valid

 

 
Since: 0.1.9

 

 

 

 
cd_device_to_string ()

-
gchar *
+
gchar *
 cd_device_to_string (CdDevice *device);

 
Converts the device to a string description.

 

@@ -2071,7 +2071,7 @@
 

 

 
cd_device_equal ()

-
gboolean
+
gboolean
 cd_device_equal (CdDevice *device1,
                  CdDevice *device2);

 
Tests two devices for equality.

@@ -2099,7 +2099,7 @@
 

 

 
Returns

-
 TRUE if the devices are the same device

+
 TRUE if the devices are the same device

 

 
Since: 0.1.8

 

@@ -2124,6 +2124,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-device-sync.html colord-1.3.3/doc/api/html/colord-cd-device-sync.html
--- colord-1.3.2/doc/api/html/colord-cd-device-sync.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-device-sync.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_connect_sync ()
@@ -49,7 +49,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_property_sync ()
@@ -57,7 +57,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_add_profile_sync ()
@@ -65,7 +65,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_remove_profile_sync ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_make_profile_default_sync ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_profiling_inhibit_sync ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_profiling_uninhibit_sync ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_enabled_sync ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_model_sync ()
@@ -129,7 +129,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_serial_sync ()
@@ -137,7 +137,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_vendor_sync ()
@@ -145,7 +145,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_kind_sync ()
@@ -153,7 +153,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_colorspace_sync ()
@@ -161,7 +161,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_device_set_mode_sync ()
@@ -180,10 +180,10 @@
 
Functions

 

 
cd_device_connect_sync ()

-
gboolean
+
gboolean
 cd_device_connect_sync (CdDevice *device,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

 
Connects to the object and fills up initial properties.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -203,12 +203,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -216,19 +216,19 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.8

 

 

 

 
cd_device_set_property_sync ()

-
gboolean
+
gboolean
 cd_device_set_property_sync (CdDevice *device,
-                             const gchar *key,
-                             const gchar *value,
-                             GCancellable *cancellable,
-                             GError **error);

+                             const gchar *key,
+                             const gchar *value,
+                             GCancellable *cancellable,
+                             GError **error);

 
Sets an object property.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -258,12 +258,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -271,19 +271,19 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.8

 

 

 

 
cd_device_add_profile_sync ()

-
gboolean
+
gboolean
 cd_device_add_profile_sync (CdDevice *device,
                             CdDeviceRelation relation,
                             CdProfile *profile,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

 
Adds a profile to a device.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -313,12 +313,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -326,18 +326,18 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.3

 

 

 

 
cd_device_remove_profile_sync ()

-
gboolean
+
gboolean
 cd_device_remove_profile_sync (CdDevice *device,
                                CdProfile *profile,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

 
Removes a profile from a device.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -362,12 +362,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -375,7 +375,7 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.2

 

@@ -385,9 +385,9 @@
 
CdProfile *
 cd_device_get_profile_for_qualifiers_sync
                                (CdDevice *device,
-                                const gchar **qualifiers,
-                                GCancellable *cancellable,
-                                GError **error);

+                                const gchar **qualifiers,
+                                GCancellable *cancellable,
+                                GError **error);

 
Gets the prefered profile for some qualifiers.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -412,12 +412,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -425,7 +425,7 @@
 

 

 
Returns

-
 a CdProfile or NULL. 

+
 a CdProfile or NULL. 

 
[transfer full]

 

 
Since: 0.1.8

@@ -433,11 +433,11 @@
 

 

 
cd_device_make_profile_default_sync ()

-
gboolean
+
gboolean
 cd_device_make_profile_default_sync (CdDevice *device,
                                      CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     GCancellable *cancellable,
+                                     GError **error);

 
Makes an already added profile default for a device.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -462,12 +462,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -475,17 +475,17 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.8

 

 

 

 
cd_device_profiling_inhibit_sync ()

-
gboolean
+
gboolean
 cd_device_profiling_inhibit_sync (CdDevice *device,
-                                  GCancellable *cancellable,
-                                  GError **error);

+                                  GCancellable *cancellable,
+                                  GError **error);

 
Sets up the device for profiling and causes no profiles to be
 returned if cd_device_get_profile_for_qualifiers_sync() is used.

 
WARNING: This function is synchronous, and may block.
@@ -506,12 +506,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -519,17 +519,17 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.1

 

 

 

 
cd_device_profiling_uninhibit_sync ()

-
gboolean
+
gboolean
 cd_device_profiling_uninhibit_sync (CdDevice *device,
-                                    GCancellable *cancellable,
-                                    GError **error);

+                                    GCancellable *cancellable,
+                                    GError **error);

 
Sets up the device for profiling and causes no profiles to be
 returned if cd_device_get_profile_for_qualifiers_sync() is used.

 
WARNING: This function is synchronous, and may block.
@@ -550,12 +550,12 @@
 
 
 
cancellable

-
a GCancellable or NULL

+
a GCancellable or NULL

  
 
 
 
error

-
a GError, or NULL.

+
a GError, or NULL.

  
 
 
@@ -563,7 +563,7 @@
 

 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 

 
Since: 0.1.1
@@ -573,8 +573,8 @@ 
CdDeviceRelation
 cd_device_get_profile_relation_sync (CdDevice *device,
                                      CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);
+ GCancellable *cancellable, + GError **error);

Gets the property relationship to the device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -599,12 +599,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -612,18 +612,18 @@

Returns

-

TRUE for success, else FALSE.

+

TRUE for success, else FALSE.

Since: 0.1.8

cd_device_set_enabled_sync ()

-
gboolean
+
gboolean
 cd_device_set_enabled_sync (CdDevice *device,
-                            gboolean enabled,
-                            GCancellable *cancellable,
-                            GError **error);

+                            gboolean enabled,
+                            GCancellable *cancellable,
+                            GError **error);

Enables or disables a device.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -648,12 +648,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -661,18 +661,18 @@

Returns

-

TRUE for success, else FALSE.

+

TRUE for success, else FALSE.

Since: 0.1.26

cd_device_set_model_sync ()

-
gboolean
+
gboolean
 cd_device_set_model_sync (CdDevice *device,
-                          const gchar *value,
-                          GCancellable *cancellable,
-                          GError **error);

+                          const gchar *value,
+                          GCancellable *cancellable,
+                          GError **error);

Sets the device model.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -697,12 +697,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -710,7 +710,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.0

@@ -718,11 +718,11 @@

cd_device_set_serial_sync ()

-
gboolean
+
gboolean
 cd_device_set_serial_sync (CdDevice *device,
-                           const gchar *value,
-                           GCancellable *cancellable,
-                           GError **error);

+                           const gchar *value,
+                           GCancellable *cancellable,
+                           GError **error);

Sets the device serial number.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -747,12 +747,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -760,7 +760,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.1

@@ -768,11 +768,11 @@

cd_device_set_vendor_sync ()

-
gboolean
+
gboolean
 cd_device_set_vendor_sync (CdDevice *device,
-                           const gchar *value,
-                           GCancellable *cancellable,
-                           GError **error);

+                           const gchar *value,
+                           GCancellable *cancellable,
+                           GError **error);

Sets the device vendor.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -797,12 +797,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -810,7 +810,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.1

@@ -818,11 +818,11 @@

cd_device_set_kind_sync ()

-
gboolean
+
gboolean
 cd_device_set_kind_sync (CdDevice *device,
                          CdDeviceKind kind,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

Sets the device kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -847,12 +847,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -860,7 +860,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.0

@@ -868,11 +868,11 @@

cd_device_set_colorspace_sync ()

-
gboolean
+
gboolean
 cd_device_set_colorspace_sync (CdDevice *device,
                                CdColorspace colorspace,
-                               GCancellable *cancellable,
-                               GError **error);

+                               GCancellable *cancellable,
+                               GError **error);

Sets the device kind.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -897,12 +897,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -910,7 +910,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.1

@@ -918,11 +918,11 @@

cd_device_set_mode_sync ()

-
gboolean
+
gboolean
 cd_device_set_mode_sync (CdDevice *device,
                          CdDeviceMode mode,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

Sets the device mode.

WARNING: This function is synchronous, and may block. Do not use it in GUI applications.

@@ -947,12 +947,12 @@

cancellable

-

a GCancellable or NULL

+

a GCancellable or NULL

 

error

-

a GError, or NULL.

+

a GError, or NULL.

  @@ -960,7 +960,7 @@

Returns

-

TRUE for success, else FALSE and error +

TRUE for success, else FALSE and error is used

Since: 0.1.2

@@ -971,6 +971,6 @@
-
Generated by GTK-Doc V1.24.1
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff -Nru colord-1.3.2/doc/api/html/colord-cd-dom.html colord-1.3.3/doc/api/html/colord-cd-dom.html --- colord-1.3.2/doc/api/html/colord-cd-dom.html 2016-03-21 11:48:32.000000000 +0000 +++ colord-1.3.3/doc/api/html/colord-cd-dom.html 2016-07-27 13:05:09.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ -GQuark +GQuark cd_dom_error_quark () @@ -57,7 +57,7 @@ -gchar * +gchar * cd_dom_to_string () @@ -65,28 +65,28 @@ -gboolean +gboolean cd_dom_parse_xml_data () -const GNode * +const GNode * cd_dom_get_node () -const gchar * +const gchar * cd_dom_get_node_name () -const gchar * +const gchar * cd_dom_get_node_data () @@ -94,7 +94,7 @@ -gint +gint cd_dom_get_node_data_as_int () @@ -102,14 +102,14 @@ -gdouble +gdouble cd_dom_get_node_data_as_double () -const gchar * +const gchar * cd_dom_get_node_attribute () @@ -117,7 +117,7 @@ -gboolean +gboolean cd_dom_get_node_rgb () @@ -125,7 +125,7 @@ -gboolean +gboolean cd_dom_get_node_yxy () @@ -133,7 +133,7 @@ -gboolean +gboolean cd_dom_get_node_lab () @@ -141,7 +141,7 @@ -GHashTable * +GHashTable * cd_dom_get_node_localized () @@ -176,7 +176,7 @@

Functions

cd_dom_error_quark ()

-
GQuark
+
GQuark
 cd_dom_error_quark (void);

 

 
Returns

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

 

 
cd_dom_to_string ()

-
gchar *
+
gchar *
 cd_dom_to_string (CdDom *dom);

 
Returns a string representation of the DOM tree.

 

@@ -226,11 +226,11 @@
 

 

 
cd_dom_parse_xml_data ()

-
gboolean
+
gboolean
 cd_dom_parse_xml_data (CdDom *dom,
-                       const gchar *data,
-                       gssize data_len,
-                       GError **error);

+                       const gchar *data,
+                       gssize data_len,
+                       GError **error);

 
Parses data into a DOM tree.

 

 
Parameters

@@ -259,7 +259,7 @@
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -270,10 +270,10 @@
 

 

 
cd_dom_get_node ()

-
const GNode *
+
const GNode *
 cd_dom_get_node (CdDom *dom,
-                 const GNode *root,
-                 const gchar *path);

+                 const GNode *root,
+                 const gchar *path);

 
Gets a node from the DOM tree.

 

 
Parameters

@@ -291,7 +291,7 @@
 
 
 
root

-
a root node, or NULL

+
a root node, or NULL

  
 
 
@@ -304,15 +304,15 @@
 

 

 
Returns

-
 A GNode, or NULL if not found

+
 A GNode, or NULL if not found

 

 
Since: 0.1.31

 

 

 

 
cd_dom_get_node_name ()

-
const gchar *
-cd_dom_get_node_name (const GNode *node);

+
const gchar *
+cd_dom_get_node_name (const GNode *node);

 
Gets the node name, e.g. "body"

 

 
Parameters

@@ -324,7 +324,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 

@@ -338,8 +338,8 @@
 

 

 
cd_dom_get_node_data ()

-
const gchar *
-cd_dom_get_node_data (const GNode *node);

+
const gchar *
+cd_dom_get_node_data (const GNode *node);

 
Gets the node data, e.g. "paragraph text"

 

 
Parameters

@@ -351,7 +351,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 

@@ -365,8 +365,8 @@
 

 

 
cd_dom_get_node_data_as_int ()

-
gint
-cd_dom_get_node_data_as_int (const GNode *node);

+
gint
+cd_dom_get_node_data_as_int (const GNode *node);

 
Gets the node data, e.g. 128

 

 
Parameters

@@ -378,22 +378,22 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 

 

 

 
Returns

-
 signed integer value, or G_MAXINT for error

+
 signed integer value, or G_MAXINT for error

 

 
Since: 0.1.32

 

 

 

 
cd_dom_get_node_data_as_double ()

-
gdouble
-cd_dom_get_node_data_as_double (const GNode *node);

+
gdouble
+cd_dom_get_node_data_as_double (const GNode *node);

 
Gets the node data, e.g. 7.4

 

 
Parameters

@@ -405,23 +405,23 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 

 

 

 
Returns

-
 floating point value, or G_MAXDOUBLE for error

+
 floating point value, or G_MAXDOUBLE for error

 

 
Since: 0.1.32

 

 

 

 
cd_dom_get_node_attribute ()

-
const gchar *
-cd_dom_get_node_attribute (const GNode *node,
-                           const gchar *key);

+
const gchar *
+cd_dom_get_node_attribute (const GNode *node,
+                           const gchar *key);

 
Gets a node attribute, e.g. "false"

 

 
Parameters

@@ -433,7 +433,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 

@@ -447,8 +447,8 @@
 

 

 
cd_dom_get_node_rgb ()

-
gboolean
-cd_dom_get_node_rgb (const GNode *node,
+
gboolean
+cd_dom_get_node_rgb (const GNode *node,
                      CdColorRGB *rgb);

 
Extracts a RGB color value from the DOM tree

 

@@ -462,7 +462,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 
@@ -475,15 +475,15 @@
 

 

 
Returns

-
 TRUE if the color was parsed successfully

+
 TRUE if the color was parsed successfully

 

 
Since: 0.1.31

 

 

 

 
cd_dom_get_node_yxy ()

-
gboolean
-cd_dom_get_node_yxy (const GNode *node,
+
gboolean
+cd_dom_get_node_yxy (const GNode *node,
                      CdColorYxy *yxy);

 
Extracts a Yxy color value from the DOM tree

 

@@ -497,7 +497,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 
@@ -510,15 +510,15 @@
 

 

 
Returns

-
 TRUE if the color was parsed successfully

+
 TRUE if the color was parsed successfully

 

 
Since: 0.1.31

 

 

 

 
cd_dom_get_node_lab ()

-
gboolean
-cd_dom_get_node_lab (const GNode *node,
+
gboolean
+cd_dom_get_node_lab (const GNode *node,
                      CdColorLab *lab);

 
Extracts a Lab color value from the DOM tree

 

@@ -532,7 +532,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 
@@ -545,16 +545,16 @@
 

 

 
Returns

-
 TRUE if the color was parsed successfully

+
 TRUE if the color was parsed successfully

 

 
Since: 0.1.31

 

 

 

 
cd_dom_get_node_localized ()

-
GHashTable *
-cd_dom_get_node_localized (const GNode *node,
-                           const gchar *key);

+
GHashTable *
+cd_dom_get_node_localized (const GNode *node,
+                           const gchar *key);

 
Extracts localized values from the DOM tree

 

 
Parameters

@@ -567,7 +567,7 @@
 
 
 
node

-
a GNode

+
a GNode

  
 
 
@@ -606,6 +606,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-icc.html colord-1.3.3/doc/api/html/colord-cd-icc.html
--- colord-1.3.2/doc/api/html/colord-cd-icc.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-icc.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-GQuark
+GQuark
 
 
 cd_icc_error_quark ()
@@ -57,7 +57,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_load_data ()
@@ -65,7 +65,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_load_file ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_load_fd ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_load_handle ()
@@ -89,7 +89,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 cd_icc_save_data ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_save_file ()
@@ -105,7 +105,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_save_default ()
@@ -113,7 +113,7 @@
 
 
 
-gchar *
+gchar *
 
 
 cd_icc_to_string ()
@@ -121,7 +121,7 @@
 
 
 
-gpointer
+gpointer
 
 
 cd_icc_get_handle ()
@@ -129,7 +129,7 @@
 
 
 
-gpointer
+gpointer
 
 
 cd_icc_get_context ()
@@ -137,14 +137,14 @@
 
 
 
-guint32
+guint32
 
 
 cd_icc_get_size ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_filename ()
@@ -160,7 +160,7 @@
 
 
 
-gdouble
+gdouble
 
 
 cd_icc_get_version ()
@@ -208,14 +208,14 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 cd_icc_get_metadata ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_metadata_item ()
@@ -239,7 +239,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_icc_get_named_colors ()
@@ -247,7 +247,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_get_can_delete ()
@@ -255,28 +255,28 @@
 
 
 
-GDateTime *
+GDateTime *
 
 
 cd_icc_get_created ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_checksum ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_description ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_characterization_data ()
@@ -291,21 +291,21 @@
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_copyright ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_manufacturer ()
 
 
 
-const gchar *
+const gchar *
 
 
 cd_icc_get_model ()
@@ -405,7 +405,7 @@
 
 
 
-guint
+guint
 
 
 cd_icc_get_temperature ()
@@ -413,7 +413,7 @@
 
 
 
-GArray *
+GArray *
 
 
 cd_icc_get_warnings ()
@@ -421,7 +421,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_create_from_edid ()
@@ -429,7 +429,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_create_from_edid_data ()
@@ -437,7 +437,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_create_default ()
@@ -445,7 +445,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_icc_get_vcgt ()
@@ -453,7 +453,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_set_vcgt ()
@@ -461,7 +461,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 cd_icc_get_response ()
@@ -469,7 +469,7 @@
 
 
 
-gchar **
+gchar **
 
 
 cd_icc_get_tags ()
@@ -477,7 +477,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 cd_icc_get_tag_data ()
@@ -485,7 +485,7 @@
 
 
 
-gboolean
+gboolean
 
 
 cd_icc_set_tag_data ()
@@ -532,7 +532,7 @@
 
Functions

 

 
cd_icc_error_quark ()

-
GQuark
+
GQuark
 cd_icc_error_quark (void);

 

 
Returns

@@ -555,12 +555,12 @@
 

 

 
cd_icc_load_data ()

-
gboolean
+
gboolean
 cd_icc_load_data (CdIcc *icc,
-                  const guint8 *data,
-                  gsize data_len,
+                  const guint8 *data,
+                  gsize data_len,
                   CdIccLoadFlags flags,
-                  GError **error);

+                  GError **error);

 
Loads an ICC profile from raw byte data.

 

 
Parameters

@@ -594,7 +594,7 @@
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -605,12 +605,12 @@
 

 

 
cd_icc_load_file ()

-
gboolean
+
gboolean
 cd_icc_load_file (CdIcc *icc,
-                  GFile *file,
+                  GFile *file,
                   CdIccLoadFlags flags,
-                  GCancellable *cancellable,
-                  GError **error);

+                  GCancellable *cancellable,
+                  GError **error);

 
Loads an ICC profile from a local or remote file.

 

 
Parameters

@@ -628,7 +628,7 @@
 
 
 
file

-
a GFile

+
a GFile

  
 
 
@@ -638,12 +638,12 @@
 
 
 
cancellable

-
A GCancellable or NULL

+
A GCancellable or NULL

  
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -654,11 +654,11 @@
 

 

 
cd_icc_load_fd ()

-
gboolean
+
gboolean
 cd_icc_load_fd (CdIcc *icc,
-                gint fd,
+                gint fd,
                 CdIccLoadFlags flags,
-                GError **error);

+                GError **error);

 
Loads an ICC profile from an open file descriptor.

 

 
Parameters

@@ -686,7 +686,7 @@
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -697,11 +697,11 @@
 

 

 
cd_icc_load_handle ()

-
gboolean
+
gboolean
 cd_icc_load_handle (CdIcc *icc,
-                    gpointer handle,
+                    gpointer handle,
                     CdIccLoadFlags flags,
-                    GError **error);

+                    GError **error);

 
Set the internal cmsHPROFILE instance. This may be required if you create
 the profile using cmsCreateRGBProfileTHR() and then want to use the
 functionality in CdIcc.

@@ -743,7 +743,7 @@
 
 
 
error

-
A GError or NULL

+
A GError or NULL

  
 
 
@@ -754,12 +754,12 @@
 

 

 
cd_icc_save_data ()

-
GBytes *
+
GBytes *
 cd_icc_save_data (CdIcc *icc,
                   CdIccSaveFlags flags,
-                  GError **error);

+                  GError **error);

 
Saves an ICC profile to an allocated memory location.

-
Return vale: A GBytes structure, or NULL for error

+
Return vale: A GBytes structure, or NULL for error

 

 
Parameters

 

@@ -781,7 +781,7 @@
 
-
+
@@ -792,14 +792,14 @@
 

 
cd_icc_save_file ()

-
gboolean
+
gboolean
 cd_icc_save_file (CdIcc *icc,
-                  GFile *file,
+                  GFile *file,
                   CdIccSaveFlags flags,
-                  GCancellable *cancellable,
-                  GError **error);

+                  GCancellable *cancellable,
+                  GError **error);

 
Saves an ICC profile to a local or remote file.

-
Return vale: TRUE for success.

+
Return vale: TRUE for success.

 

 
Parameters

 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

@@ -816,7 +816,7 @@
 
-
+
@@ -826,12 +826,12 @@
 
-
+
-
+
@@ -842,13 +842,13 @@
 

 
cd_icc_save_default ()

-
gboolean
+
gboolean
 cd_icc_save_default (CdIcc *icc,
                      CdIccSaveFlags flags,
-                     GCancellable *cancellable,
-                     GError **error);

+                     GCancellable *cancellable,
+                     GError **error);

 
Saves an ICC profile to the default per-user location.

-
Return vale: TRUE for success.

+
Return vale: TRUE for success.

 

 
Parameters

 

 

 
file
a GFile
a GFile

  
 

 

 

 
cancellable
A GCancellable or NULL
A GCancellable or NULL

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

@@ -870,12 +870,12 @@
 
-
+
-
+
@@ -886,7 +886,7 @@
 

 
cd_icc_to_string ()

-
gchar *
+
gchar *
 cd_icc_to_string (CdIcc *icc);

 
Returns a string representation of the ICC profile.

 

@@ -913,7 +913,7 @@
 

 

 
cd_icc_get_handle ()

-
gpointer
+
gpointer
 cd_icc_get_handle (CdIcc *icc);

 
Return the cmsHPROFILE instance used locally. This may be required if you
 are using the profile in a transform.

@@ -941,7 +941,7 @@
 

 

 
cd_icc_get_context ()

-
gpointer
+
gpointer
 cd_icc_get_context (CdIcc *icc);

 
Return the cmsContext instance used locally. This may be required if you
 are using native LCMS calls and then cd_icc_load_handle().

@@ -970,7 +970,7 @@
 

 

 
cd_icc_get_size ()

-
guint32
+
guint32
 cd_icc_get_size (CdIcc *icc);

 
Gets the ICC profile file size

 

@@ -982,7 +982,7 @@
 

 

 
cd_icc_get_filename ()

-
const gchar *
+
const gchar *
 cd_icc_get_filename (CdIcc *icc);

 
Gets the filename of the ICC data, if one exists.

 

@@ -1002,7 +1002,7 @@
 

 

 
Returns

-
 A filename, or NULL

+
 A filename, or NULL

 

 
Since: 0.1.32

 

@@ -1011,7 +1011,7 @@
 
cd_icc_set_filename ()

 
void
 cd_icc_set_filename (CdIcc *icc,
-                     const gchar *filename);

+                     const gchar *filename);

 
Sets the filename, which may be required if the ICC profile has been loaded
 using cd_icc_load_fd() from a disk cache.

 

@@ -1030,7 +1030,7 @@
 
 

-
+
@@ -1041,7 +1041,7 @@
 

 
cd_icc_get_version ()

-
gdouble
+
gdouble
 cd_icc_get_version (CdIcc *icc);

 
Gets the ICC profile version, typically 2.1 or 4.2

 

@@ -1070,7 +1070,7 @@
 
cd_icc_set_version ()

 
void
 cd_icc_set_version (CdIcc *icc,
-                    gdouble version);

+                    gdouble version);

 
Sets the profile version.

 

 
Parameters

@@ -1215,7 +1215,7 @@
 

 

 
cd_icc_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_icc_get_metadata (CdIcc *icc);

 
Gets all the metadata from the ICC profile.

 

@@ -1243,9 +1243,9 @@
 

 

 
cd_icc_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_icc_get_metadata_item (CdIcc *icc,
-                          const gchar *key);

+                          const gchar *key);

 
Gets an item of data from the ICC metadata store.

 

 
Parameters

@@ -1271,7 +1271,7 @@
 

 

 
Returns

-
 The dictionary data, or NULL if the key does not exist.

+
 The dictionary data, or NULL if the key does not exist.

 

 
Since: 0.1.32

 

@@ -1280,8 +1280,8 @@
 
cd_icc_add_metadata ()

 
void
 cd_icc_add_metadata (CdIcc *icc,
-                     const gchar *key,
-                     const gchar *value);

+                     const gchar *key,
+                     const gchar *value);

 
Sets an item of data to the profile metadata, overwriting it if
 it already exists.

 

@@ -1318,7 +1318,7 @@
 
cd_icc_remove_metadata ()

 
void
 cd_icc_remove_metadata (CdIcc *icc,
-                        const gchar *key);

+                        const gchar *key);
 
Removes an item of metadata.

 

 
Parameters

@@ -1347,7 +1347,7 @@
 

 

 
cd_icc_get_named_colors ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_named_colors (CdIcc *icc);

 
Gets any named colors in the profile.
 This function will only return results if the profile was loaded with the
@@ -1377,7 +1377,7 @@
 

 

 
cd_icc_get_can_delete ()

-
gboolean
+
gboolean
 cd_icc_get_can_delete (CdIcc *icc);

 
Finds out if the profile could be deleted.
 This is only applicable for profiles loaded with cd_icc_load_file() as
@@ -1399,14 +1399,14 @@
 

 

 
Returns

-
 TRUE if g_file_delete() would likely work

+
 TRUE if g_file_delete() would likely work

 

 
Since: 0.1.32

 

 

 

 
cd_icc_get_created ()

-
GDateTime *
+
GDateTime *
 cd_icc_get_created (CdIcc *icc);

 
Gets the ICC creation date and time.

 

@@ -1426,14 +1426,14 @@
 

 

 
Returns

-
 A GDateTime object, or NULL for not set

+
 A GDateTime object, or NULL for not set

 

 
Since: 0.1.32

 

 

 

 
cd_icc_get_checksum ()

-
const gchar *
+
const gchar *
 cd_icc_get_checksum (CdIcc *icc);

 
Gets the profile checksum if one exists.
 This will either be the embedded profile ID, or the file checksum if
@@ -1456,17 +1456,17 @@
 

 

 
Returns

-
 An embedded MD5 checksum, or NULL for not set

+
 An embedded MD5 checksum, or NULL for not set

 

 
Since: 0.1.32

 

 

 

 
cd_icc_get_description ()

-
const gchar *
+
const gchar *
 cd_icc_get_description (CdIcc *icc,
-                        const gchar *locale,
-                        GError **error);

+                        const gchar *locale,
+                        GError **error);

 
Gets the profile description.
 If the translated text is not available in the selected locale then the
 default untranslated (en_US) text is returned.

@@ -1486,12 +1486,12 @@
 
 

-
+
-
+
@@ -1499,7 +1499,7 @@
 

 
Returns

-
 The text as a UTF-8 string, or NULL of the locale is invalid
+
 The text as a UTF-8 string, or NULL of the locale is invalid
 or the tag does not exist.

 
Since: 0.1.32

@@ -1507,7 +1507,7 @@
 

 
cd_icc_get_characterization_data ()

-
const gchar *
+
const gchar *
 cd_icc_get_characterization_data (CdIcc *icc);

 
Gets any characterization data used to build the profile.
 This function will only return results if the profile was loaded with the
@@ -1538,7 +1538,7 @@
 
cd_icc_set_characterization_data ()

 
void
 cd_icc_set_characterization_data (CdIcc *icc,
-                                  const gchar *data);

+                                  const gchar *data);

 
Sets the characterization data used to build the profile.

 

 
Parameters

@@ -1556,7 +1556,7 @@
 
 

-
+
@@ -1567,10 +1567,10 @@
 

 
cd_icc_get_copyright ()

-
const gchar *
+
const gchar *
 cd_icc_get_copyright (CdIcc *icc,
-                      const gchar *locale,
-                      GError **error);

+                      const gchar *locale,
+                      GError **error);

 
Gets the profile copyright.
 If the translated text is not available in the selected locale then the
 default untranslated (en_US) text is returned.

@@ -1590,12 +1590,12 @@
 
 

-
+
-
+
@@ -1603,7 +1603,7 @@
 

 
Returns

-
 The text as a UTF-8 string, or NULL of the locale is invalid
+
 The text as a UTF-8 string, or NULL of the locale is invalid
 or the tag does not exist.

 
Since: 0.1.32

@@ -1611,10 +1611,10 @@
 

 
cd_icc_get_manufacturer ()

-
const gchar *
+
const gchar *
 cd_icc_get_manufacturer (CdIcc *icc,
-                         const gchar *locale,
-                         GError **error);

+                         const gchar *locale,
+                         GError **error);

 
Gets the profile manufacturer.
 If the translated text is not available in the selected locale then the
 default untranslated (en_US) text is returned.

@@ -1634,12 +1634,12 @@
 
 

-
+
-
+
@@ -1647,7 +1647,7 @@
 

 
Returns

-
 The text as a UTF-8 string, or NULL of the locale is invalid
+
 The text as a UTF-8 string, or NULL of the locale is invalid
 or the tag does not exist.

 
Since: 0.1.32

@@ -1655,10 +1655,10 @@
 

 
cd_icc_get_model ()

-
const gchar *
+
const gchar *
 cd_icc_get_model (CdIcc *icc,
-                  const gchar *locale,
-                  GError **error);

+                  const gchar *locale,
+                  GError **error);

 
Gets the profile model.
 If the translated text is not available in the selected locale then the
 default untranslated (en_US) text is returned.

@@ -1678,12 +1678,12 @@
 
 

-
+
-
+
@@ -1691,7 +1691,7 @@
 

 
Returns

-
 The text as a UTF-8 string, or NULL of the locale is invalid
+
 The text as a UTF-8 string, or NULL of the locale is invalid
 or the tag does not exist.

 
Since: 0.1.32

@@ -1701,8 +1701,8 @@
 
cd_icc_set_description ()
void
 cd_icc_set_description (CdIcc *icc,
-                        const gchar *locale,
-                        const gchar *value);

+                        const gchar *locale,
+                        const gchar *value);
Sets the profile description for a specific locale.

 
Parameters

@@ -1720,7 +1720,7 @@
 
 

-
+
@@ -1738,7 +1738,7 @@
 
cd_icc_set_description_items ()
void
 cd_icc_set_description_items (CdIcc *icc,
-                              GHashTable *values);

+                              GHashTable *values);
Sets the profile descriptions for specific locales.

 
Parameters

@@ -1769,8 +1769,8 @@
 
cd_icc_set_copyright ()

 
void
 cd_icc_set_copyright (CdIcc *icc,
-                      const gchar *locale,
-                      const gchar *value);

+                      const gchar *locale,
+                      const gchar *value);
 
Sets the profile _copyright for a specific locale.

 

 
Parameters

@@ -1788,7 +1788,7 @@
 

-
+
@@ -1806,7 +1806,7 @@
 
cd_icc_set_copyright_items ()
void
 cd_icc_set_copyright_items (CdIcc *icc,
-                            GHashTable *values);

+                            GHashTable *values);
Sets the profile copyrights for specific locales.

 
Parameters

@@ -1837,8 +1837,8 @@
 
cd_icc_set_manufacturer ()

 
void
 cd_icc_set_manufacturer (CdIcc *icc,
-                         const gchar *locale,
-                         const gchar *value);

+                         const gchar *locale,
+                         const gchar *value);
 
Sets the profile manufacturer for a specific locale.

 

 
Parameters

@@ -1856,7 +1856,7 @@
 

-
+
@@ -1874,7 +1874,7 @@
 
cd_icc_set_manufacturer_items ()
void
 cd_icc_set_manufacturer_items (CdIcc *icc,
-                               GHashTable *values);

+                               GHashTable *values);
Sets the profile manufacturers for specific locales.

 
Parameters

@@ -1905,8 +1905,8 @@
 
cd_icc_set_model ()

 
void
 cd_icc_set_model (CdIcc *icc,
-                  const gchar *locale,
-                  const gchar *value);

+                  const gchar *locale,
+                  const gchar *value);
 
Sets the profile model for a specific locale.

 

 
Parameters

@@ -1924,7 +1924,7 @@
 

-
+
@@ -1942,7 +1942,7 @@
 
cd_icc_set_model_items ()
void
 cd_icc_set_model_items (CdIcc *icc,
-                        GHashTable *values);

+                        GHashTable *values);
Sets the profile models for specific locales.

 
Parameters

@@ -2087,7 +2087,7 @@
 

 

 
cd_icc_get_temperature ()

-
guint
+
guint
 cd_icc_get_temperature (CdIcc *icc);

 
Gets the ICC color temperature, rounded to the nearest 100K.
 This function will only return results if the profile was loaded with the
@@ -2116,7 +2116,7 @@
 

 

 
cd_icc_get_warnings ()

-
GArray *
+
GArray *
 cd_icc_get_warnings (CdIcc *icc);

 
Returns any warnings with profiles

 

@@ -2144,14 +2144,14 @@
 

 

 
cd_icc_create_from_edid ()

-
gboolean
+
gboolean
 cd_icc_create_from_edid (CdIcc *icc,
-                         gdouble gamma_value,
+                         gdouble gamma_value,
                          const CdColorYxy *red,
                          const CdColorYxy *green,
                          const CdColorYxy *blue,
                          const CdColorYxy *white,
-                         GError **error);

+                         GError **error);

 
Creates an ICC profile from EDID data.

 

 
Parameters

@@ -2194,7 +2194,7 @@
 

-
+
@@ -2202,17 +2202,17 @@
 

 
Returns

-
 TRUE for success

+
 TRUE for success

 
Since: 0.1.32

 
cd_icc_create_from_edid_data ()

-
gboolean
+
gboolean
 cd_icc_create_from_edid_data (CdIcc *icc,
                               CdEdid *edid,
-                              GError **error);

+                              GError **error);

 
Creates an ICC profile from EDID data.

 

 
Parameters

@@ -2235,7 +2235,7 @@
 
 

-
+
@@ -2243,16 +2243,16 @@
 

 
Returns

-
 TRUE for success

+
 TRUE for success

 
Since: 1.1.2

 
cd_icc_create_default ()

-
gboolean
+
gboolean
 cd_icc_create_default (CdIcc *icc,
-                       GError **error);

+                       GError **error);

 
Creates a default sRGB ICC profile.

 

 
Parameters

@@ -2270,7 +2270,7 @@
 
 

-
+
@@ -2278,17 +2278,17 @@
 

 
Returns

-
 TRUE for success

+
 TRUE for success

 
Since: 1.1.2

 
cd_icc_get_vcgt ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_vcgt (CdIcc *icc,
-                 guint size,
-                 GError **error);

+                 guint size,
+                 GError **error);

 
Gets the video card calibration data from the profile.

 

 
Parameters

@@ -2311,7 +2311,7 @@
 
 

-
+
@@ -2319,7 +2319,7 @@
 

 
Returns

-
 VCGT data, or NULL for error. 

+
 VCGT data, or NULL for error. 

 
[transfer container][element-type CdColorRGB]

 
Since: 0.1.34

@@ -2327,12 +2327,12 @@
 

 
cd_icc_set_vcgt ()

-
gboolean
+
gboolean
 cd_icc_set_vcgt (CdIcc *icc,
-                 GPtrArray *vcgt,
-                 GError **error);

+                 GPtrArray *vcgt,
+                 GError **error);

 
Sets the Video Card Gamma Table from the profile.

-
Return vale: TRUE for success.

+
Return vale: TRUE for success.

 

 
Parameters

 

 

 
cancellable
A GCancellable or NULL
A GCancellable or NULL

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

 
filename
a filename, or NULL
a filename, or NULL

  
 

 
 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
data
TI3 string data, or NULL
TI3 string data, or NULL

  
 

 
 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
 
 

 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
 
 

 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
 
 

 

 
locale
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default
A locale, e.g. "en_GB.UTF-8" or NULL for the profile default

  
 

 

 
 
 

 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 
 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 
 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 
 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

@@ -2354,7 +2354,7 @@
 
-
+
@@ -2365,10 +2365,10 @@
 

 
cd_icc_get_response ()

-
GPtrArray *
+
GPtrArray *
 cd_icc_get_response (CdIcc *icc,
-                     guint size,
-                     GError **error);

+                     guint size,
+                     GError **error);

 
Generates a response curve of a specified size.

 

 
Parameters

@@ -2391,7 +2391,7 @@
 
 

-
+
@@ -2399,7 +2399,7 @@
 

 
Returns

-
 response data, or NULL for error. 

+
 response data, or NULL for error. 

 
[transfer container][element-type CdColorRGB]

 
Since: 0.1.34

@@ -2407,9 +2407,9 @@
 

 
cd_icc_get_tags ()

-
gchar **
+
gchar **
 cd_icc_get_tags (CdIcc *icc,
-                 GError **error);

+                 GError **error);

 
Returns the internal tag table. Most users do not need to do this.

 

 
Parameters

@@ -2427,7 +2427,7 @@
 
 

-
+
@@ -2443,10 +2443,10 @@
 

 
cd_icc_get_tag_data ()

-
GBytes *
+
GBytes *
 cd_icc_get_tag_data (CdIcc *icc,
-                     const gchar *tag,
-                     GError **error);

+                     const gchar *tag,
+                     GError **error);

 
Returns the raw data for the specific tag.
 Most users do not need to do this.

 

@@ -2470,7 +2470,7 @@
 
 

-
+
@@ -2486,11 +2486,11 @@
 

 
cd_icc_set_tag_data ()

-
gboolean
+
gboolean
 cd_icc_set_tag_data (CdIcc *icc,
-                     const gchar *tag,
-                     GBytes *data,
-                     GError **error);

+                     const gchar *tag,
+                     GBytes *data,
+                     GError **error);

 
Sets the raw data for the specific tag.
 Most users do not need to do this.

 

@@ -2519,7 +2519,7 @@
 
 

-
+
@@ -2724,6 +2724,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-icc-utils.html colord-1.3.3/doc/api/html/colord-cd-icc-utils.html
--- colord-1.3.2/doc/api/html/colord-cd-icc-utils.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-icc-utils.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -40,7 +40,7 @@
 
-
+
@@ -108,6 +108,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-interp-akima.html colord-1.3.3/doc/api/html/colord-cd-interp-akima.html
--- colord-1.3.2/doc/api/html/colord-cd-interp-akima.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-interp-akima.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -71,6 +71,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-interp.html colord-1.3.3/doc/api/html/colord-cd-interp.html
--- colord-1.3.2/doc/api/html/colord-cd-interp.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-interp.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -41,7 +41,7 @@
 
-
-
+
@@ -389,7 +389,7 @@
 

 
cd_interp_kind_to_string ()

-
const gchar *
+
const gchar *
 cd_interp_kind_to_string (CdInterpKind kind);

 

@@ -462,6 +462,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-interp-linear.html colord-1.3.3/doc/api/html/colord-cd-interp-linear.html
--- colord-1.3.2/doc/api/html/colord-cd-interp-linear.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-interp-linear.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -71,6 +71,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-it8.html colord-1.3.3/doc/api/html/colord-cd-it8.html
--- colord-1.3.2/doc/api/html/colord-cd-it8.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-it8.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -41,7 +41,7 @@
 
-
-
-
-
-
+
@@ -443,17 +443,17 @@
 

 
Returns

-
 TRUE if a valid it8 file was read.

+
 TRUE if a valid it8 file was read.

 
Since: 0.1.20

 
cd_it8_load_from_file ()

-
gboolean
+
gboolean
 cd_it8_load_from_file (CdIt8 *it8,
-                       GFile *file,
-                       GError **error);

+                       GFile *file,
+                       GError **error);

 
Loads a it8 file from disk.

 

 
Parameters

@@ -471,12 +471,12 @@
 
 

-
+
-
+
@@ -484,17 +484,17 @@
 

 
Returns

-
 TRUE if a valid it8 file was read.

+
 TRUE if a valid it8 file was read.

 
Since: 0.1.20

 
cd_it8_save_to_file ()

-
gboolean
+
gboolean
 cd_it8_save_to_file (CdIt8 *it8,
-                     GFile *file,
-                     GError **error);

+                     GFile *file,
+                     GError **error);

 
Saves a it8 file to disk

 

 
Parameters

@@ -512,12 +512,12 @@
 
 

-
+
-
+
@@ -525,18 +525,18 @@
 

 
Returns

-
 TRUE if it8 file was saved.

+
 TRUE if it8 file was saved.

 
Since: 0.1.20

 
cd_it8_save_to_data ()

-
gboolean
+
gboolean
 cd_it8_save_to_data (CdIt8 *it8,
-                     gchar **data,
-                     gsize *size,
-                     GError **error);

+                     gchar **data,
+                     gsize *size,
+                     GError **error);

 
Saves a it8 file to an area of memory.

 

 
Parameters

@@ -565,7 +565,7 @@
 
 

-
+
@@ -573,7 +573,7 @@
 

 
Returns

-
 TRUE if it8 file was saved.

+
 TRUE if it8 file was saved.

 
Since: 0.1.26

@@ -613,7 +613,7 @@
 
cd_it8_set_normalized ()
void
 cd_it8_set_normalized (CdIt8 *it8,
-                       gboolean normalized);

+                       gboolean normalized);
Sets if normalized data should be written to the .it8 file.

 
Parameters

@@ -644,7 +644,7 @@
 
cd_it8_set_originator ()

 
void
 cd_it8_set_originator (CdIt8 *it8,
-                       const gchar *originator);

+                       const gchar *originator);
 
Sets the program name that created the .it8 file

 

 
Parameters

@@ -675,7 +675,7 @@
 
cd_it8_set_title ()

 
void
 cd_it8_set_title (CdIt8 *it8,
-                  const gchar *title);

+                  const gchar *title);
 
Sets the display name for the file.

 

 
Parameters

@@ -706,7 +706,7 @@
 
cd_it8_set_spectral ()

 
void
 cd_it8_set_spectral (CdIt8 *it8,
-                     gboolean spectral);

+                     gboolean spectral);
 
Sets if spectral data should be written to the .it8 file.

 

 
Parameters

@@ -737,7 +737,7 @@
 
cd_it8_set_instrument ()

 
void
 cd_it8_set_instrument (CdIt8 *it8,
-                       const gchar *instrument);

+                       const gchar *instrument);
 
Sets the measuring instrument that created the .it8 file

 

 
Parameters

@@ -768,7 +768,7 @@
 
cd_it8_set_reference ()

 
void
 cd_it8_set_reference (CdIt8 *it8,
-                      const gchar *reference);

+                      const gchar *reference);
 
Sets the reference that as used to create the .it8 reference

 

 
Parameters

@@ -799,7 +799,7 @@
 
cd_it8_set_enable_created ()

 
void
 cd_it8_set_enable_created (CdIt8 *it8,
-                           gboolean enable_created);

+                           gboolean enable_created);
 
Sets if the 'CREATED' attribute should be written. This is mainly useful
 in the self test programs where we want to string compare the output data
 with a known reference.

@@ -854,12 +854,12 @@
 
 

-
+
-
+
@@ -872,7 +872,7 @@
 
cd_it8_add_option ()
void
 cd_it8_add_option (CdIt8 *it8,
-                   const gchar *option);

+                   const gchar *option);
Sets any extra options that have to be set in the CCMX file

 
Parameters

@@ -934,7 +934,7 @@
 
cd_it8_set_spectrum_array ()

 
void
 cd_it8_set_spectrum_array (CdIt8 *it8,
-                           GPtrArray *data);

+                           GPtrArray *data);
 
Set the spectral data

 

 
Parameters

@@ -1048,7 +1048,7 @@
 

 

 
cd_it8_get_normalized ()

-
gboolean
+
gboolean
 cd_it8_get_normalized (CdIt8 *it8);

 
Gets if the data should be written normlaised to y=100.

 

@@ -1068,14 +1068,14 @@
 

 

 
Returns

-
 TRUE if the data should be normalised.

+
 TRUE if the data should be normalised.

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_originator ()

-
const gchar *
+
const gchar *
 cd_it8_get_originator (CdIt8 *it8);

 
Gets the file orginator.

 

@@ -1095,14 +1095,14 @@
 

 

 
Returns

-
 The originator, or NULL if unset

+
 The originator, or NULL if unset

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_title ()

-
const gchar *
+
const gchar *
 cd_it8_get_title (CdIt8 *it8);

 
Gets the file title.

 

@@ -1122,14 +1122,14 @@
 

 

 
Returns

-
 The title, or NULL if unset

+
 The title, or NULL if unset

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_spectral ()

-
gboolean
+
gboolean
 cd_it8_get_spectral (CdIt8 *it8);

 
Gets if the data is spectral or XYZ.

 

@@ -1149,14 +1149,14 @@
 

 

 
Returns

-
 TRUE if the data is in spectral bands.

+
 TRUE if the data is in spectral bands.

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_instrument ()

-
const gchar *
+
const gchar *
 cd_it8_get_instrument (CdIt8 *it8);

 
Gets the instrument the file was created by.

 

@@ -1176,14 +1176,14 @@
 

 

 
Returns

-
 The instrument, or NULL if unset

+
 The instrument, or NULL if unset

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_reference ()

-
const gchar *
+
const gchar *
 cd_it8_get_reference (CdIt8 *it8);

 
Gets the reference the file was created against.

 

@@ -1203,14 +1203,14 @@
 

 

 
Returns

-
 The reference, or NULL if unset

+
 The reference, or NULL if unset

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_enable_created ()

-
gboolean
+
gboolean
 cd_it8_get_enable_created (CdIt8 *it8);

 
Gets if the 'CREATED' attribute will be written. This is typically only
 set in the self test programs.

@@ -1231,14 +1231,14 @@
 

 

 
Returns

-
 The reference, or NULL if unset

+
 The reference, or NULL if unset

 

 
Since: 0.1.33

 

 

 

 
cd_it8_get_data_size ()

-
guint
+
guint
 cd_it8_get_data_size (CdIt8 *it8);

 
Gets the data size.

 

@@ -1265,9 +1265,9 @@
 

 

 
cd_it8_get_data_item ()

-
gboolean
+
gboolean
 cd_it8_get_data_item (CdIt8 *it8,
-                      guint idx,
+                      guint idx,
                       CdColorRGB *rgb,
                       CdColorXYZ *xyz);

 
Gets a specific bit of data from this object.
@@ -1306,14 +1306,14 @@
 

 

 
Returns

-
 TRUE if the index existed.

+
 TRUE if the index existed.

 

 
Since: 0.1.20

 

 

 

 
cd_it8_get_spectrum_array ()

-
GPtrArray *
+
GPtrArray *
 cd_it8_get_spectrum_array (CdIt8 *it8);

 
Gets the spectral data of IT8 file.

 

@@ -1343,7 +1343,7 @@
 
cd_it8_get_spectrum_by_id ()

 
CdSpectrum *
 cd_it8_get_spectrum_by_id (CdIt8 *it8,
-                           const gchar *id);

+                           const gchar *id);

 
Gets a specific spectrum in an IT8 file.

 

 
Parameters

@@ -1369,7 +1369,7 @@
 

 

 
Returns

-
 spectrum, or NULL. 

+
 spectrum, or NULL. 

 
[transfer none]

 

 
Since: 1.1.6

@@ -1377,9 +1377,9 @@
 

 

 
cd_it8_has_option ()

-
gboolean
+
gboolean
 cd_it8_has_option (CdIt8 *it8,
-                   const gchar *option);

+                   const gchar *option);

 
Finds an option in the file.

 

 
Parameters

@@ -1405,7 +1405,7 @@
 

 

 
Returns

-
 TRUE if the option is set

+
 TRUE if the option is set

 

 
Since: 0.1.20

 

@@ -1414,10 +1414,10 @@
 
cd_it8_get_xyz_for_rgb ()

 
CdColorXYZ *
 cd_it8_get_xyz_for_rgb (CdIt8 *it8,
-                        gdouble R,
-                        gdouble G,
-                        gdouble B,
-                        gdouble delta);

+                        gdouble R,
+                        gdouble G,
+                        gdouble B,
+                        gdouble delta);

 
Gets the XYZ value for a specific RGB value.

 

 
Parameters

@@ -1458,7 +1458,7 @@
 

 

 
Returns

-
 A CdColorXYZ, or NULL if the sample does not exist. 

+
 A CdColorXYZ, or NULL if the sample does not exist. 

 
[transfer none]

 

 
Since: 1.2.6

@@ -1575,6 +1575,6 @@
 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-it8-utils.html colord-1.3.3/doc/api/html/colord-cd-it8-utils.html
--- colord-1.3.2/doc/api/html/colord-cd-it8-utils.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-it8-utils.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -41,7 +41,7 @@
 
-
+
@@ -123,19 +123,19 @@
 

 
Returns

-
 TRUE if a correction matrix was found.

+
 TRUE if a correction matrix was found.

 

 
cd_it8_utils_calculate_xyz_from_cmf ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_xyz_from_cmf (CdIt8 *cmf,
                                      CdSpectrum *illuminant,
                                      CdSpectrum *spectrum,
                                      CdColorXYZ *value,
-                                     gdouble resolution,
-                                     GError **error);

+                                     gdouble resolution,
+                                     GError **error);

 
This calculates the XYZ from a CMF, illuminant and input spectrum.

 

 
Parameters

@@ -173,7 +173,7 @@
 
 

-
+
@@ -181,19 +181,19 @@
 

 
Returns

-
 TRUE if a XYZ value was set.

+
 TRUE if a XYZ value was set.

 

 
cd_it8_utils_calculate_cri_from_cmf ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_cri_from_cmf (CdIt8 *cmf,
                                      CdIt8 *tcs,
                                      CdSpectrum *illuminant,
-                                     gdouble *value,
-                                     gdouble resolution,
-                                     GError **error);

+                                     gdouble *value,
+                                     gdouble resolution,
+                                     GError **error);

 
This calculates the CRI for a specific illuminant.

 

 
Parameters

@@ -231,7 +231,7 @@
 
 

-
+
@@ -239,16 +239,16 @@
 

 
Returns

-
 TRUE if a XYZ value was set.

+
 TRUE if a XYZ value was set.

 

 
cd_it8_utils_calculate_gamma ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_gamma (CdIt8 *it8,
-                              gdouble *gamma_y,
-                              GError **error);

+                              gdouble *gamma_y,
+                              GError **error);

 
This estimates the gamma from values obtained from an .ti3 file.

 

 
Parameters

@@ -271,7 +271,7 @@
 
 

-
+
@@ -279,7 +279,7 @@
 

 
Returns

-
 TRUE if a valid value was found.

+
 TRUE if a valid value was found.

 
Since: 0.2.6

@@ -289,6 +289,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-math.html colord-1.3.3/doc/api/html/colord-cd-math.html
--- colord-1.3.2/doc/api/html/colord-cd-math.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-math.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -81,7 +81,7 @@
 
-
-
-
-
-
-
-
-
+
@@ -414,10 +414,10 @@
 

 
cd_profile_connect_finish ()

-
gboolean
+
gboolean
 cd_profile_connect_finish (CdProfile *profile,
-                           GAsyncResult *res,
-                           GError **error);

+                           GAsyncResult *res,
+                           GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -435,12 +435,12 @@
 

-
+
-
+
@@ -457,11 +457,11 @@
 
cd_profile_set_property ()
void
 cd_profile_set_property (CdProfile *profile,
-                         const gchar *key,
-                         const gchar *value,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);

+                         const gchar *key,
+                         const gchar *value,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);
Deletes a color device.

 
Parameters

@@ -489,7 +489,7 @@
 
 

-
+
@@ -511,10 +511,10 @@
 

 
cd_profile_set_property_finish ()

-
gboolean
+
gboolean
 cd_profile_set_property_finish (CdProfile *profile,
-                                GAsyncResult *res,
-                                GError **error);

+                                GAsyncResult *res,
+                                GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -532,12 +532,12 @@
 

-
+
-
+
@@ -554,9 +554,9 @@
 
cd_profile_install_system_wide ()
void
 cd_profile_install_system_wide (CdProfile *profile,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
Sets the profile system wide.

 
Parameters

@@ -574,7 +574,7 @@
 
 

-
+
@@ -596,10 +596,10 @@
 

 
cd_profile_install_system_wide_finish ()

-
gboolean
+
gboolean
 cd_profile_install_system_wide_finish (CdProfile *profile,
-                                       GAsyncResult *res,
-                                       GError **error);

+                                       GAsyncResult *res,
+                                       GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -617,12 +617,12 @@
 

-
+
-
+
@@ -637,7 +637,7 @@
 

 
cd_profile_get_id ()

-
const gchar *
+
const gchar *
 cd_profile_get_id (CdProfile *profile);

 
Gets the profile ID.

 

@@ -657,14 +657,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

 

 
cd_profile_get_filename ()

-
const gchar *
+
const gchar *
 cd_profile_get_filename (CdProfile *profile);

 
Gets the profile filename.

 

@@ -684,14 +684,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

 

 
cd_profile_get_qualifier ()

-
const gchar *
+
const gchar *
 cd_profile_get_qualifier (CdProfile *profile);

 
Gets the profile qualifier.

 

@@ -711,14 +711,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

 

 
cd_profile_get_format ()

-
const gchar *
+
const gchar *
 cd_profile_get_format (CdProfile *profile);

 
Gets the profile format.

 

@@ -738,14 +738,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.4

 

 
cd_profile_get_title ()

-
const gchar *
+
const gchar *
 cd_profile_get_title (CdProfile *profile);

 
Gets the profile title.

 

@@ -765,14 +765,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.0

 

 
cd_profile_get_object_path ()

-
const gchar *
+
const gchar *
 cd_profile_get_object_path (CdProfile *profile);

 
Gets the object path for the profile.

 

@@ -792,7 +792,7 @@
 

 

 
Returns

-
 the object path, or NULL

+
 the object path, or NULL

 

 
Since: 0.1.0

 

@@ -880,7 +880,7 @@
 

 
cd_profile_get_owner ()

-
guint
+
guint
 cd_profile_get_owner (CdProfile *profile);

 
Gets the profile owner.

 

@@ -907,7 +907,7 @@
 

 

 
cd_profile_get_warnings ()

-
gchar **
+
gchar **
 cd_profile_get_warnings (CdProfile *profile);

 
Gets the profile warnings as a string array.

 

@@ -935,7 +935,7 @@
 

 

 
cd_profile_get_created ()

-
gint64
+
gint64
 cd_profile_get_created (CdProfile *profile);

 
Gets the profile created date and time.

 

@@ -962,7 +962,7 @@
 

 

 
cd_profile_get_age ()

-
gint64
+
gint64
 cd_profile_get_age (CdProfile *profile);

 
Gets the profile age in seconds relative to the current time.

 

@@ -989,7 +989,7 @@
 

 

 
cd_profile_get_has_vcgt ()

-
gboolean
+
gboolean
 cd_profile_get_has_vcgt (CdProfile *profile);

 
Returns if the profile has a VCGT table.

 

@@ -1009,14 +1009,14 @@
 

 

 
Returns

-
 TRUE if VCGT is valid.

+
 TRUE if VCGT is valid.

 

 
Since: 0.1.2

 

 

 

 
cd_profile_get_is_system_wide ()

-
gboolean
+
gboolean
 cd_profile_get_is_system_wide (CdProfile *profile);

 
Returns if the profile is installed system wide and available for all
 users.

@@ -1037,14 +1037,14 @@
 

 

 
Returns

-
 TRUE if system wide.

+
 TRUE if system wide.

 

 
Since: 0.1.2

 

 

 

 
cd_profile_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_profile_get_metadata (CdProfile *profile);

 
Returns the profile metadata.

 

@@ -1065,7 +1065,7 @@
 

 
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

 
Since: 0.1.2

@@ -1073,9 +1073,9 @@
 

 

 
cd_profile_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_profile_get_metadata_item (CdProfile *profile,
-                              const gchar *key);

+                              const gchar *key);

 
Returns the profile metadata for a specific key.

 

 
Parameters

@@ -1101,7 +1101,7 @@
 

 

 
Returns

-
 the metadata value, or NULL if not set.

+
 the metadata value, or NULL if not set.

 

 
Since: 0.1.5

 

@@ -1110,7 +1110,7 @@
 
cd_profile_set_object_path ()

 
void
 cd_profile_set_object_path (CdProfile *profile,
-                            const gchar *object_path);

+                            const gchar *object_path);

 
Sets the object path of the profile.

 

 
Parameters

@@ -1139,7 +1139,7 @@
 

 

 
cd_profile_get_connected ()

-
gboolean
+
gboolean
 cd_profile_get_connected (CdProfile *profile);

 
Gets if the profile has been connected.

 

@@ -1159,14 +1159,14 @@
 

 

 
Returns

-
 TRUE if properties are valid

+
 TRUE if properties are valid

 

 
Since: 0.1.9

 

 

 

 
cd_profile_to_string ()

-
gchar *
+
gchar *
 cd_profile_to_string (CdProfile *profile);

 
Converts the profile to a string description.

 

@@ -1193,7 +1193,7 @@
 

 

 
cd_profile_equal ()

-
gboolean
+
gboolean
 cd_profile_equal (CdProfile *profile1,
                   CdProfile *profile2);

 
Tests two profiles for equality.

@@ -1221,14 +1221,14 @@
 

 

 
Returns

-
 TRUE if the profiles are the same device

+
 TRUE if the profiles are the same device

 

 
Since: 0.1.8

 

 

 

 
cd_profile_has_access ()

-
gboolean
+
gboolean
 cd_profile_has_access (CdProfile *profile);

 
Gets if the current user has access permissions to the profile.

 

@@ -1248,7 +1248,7 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.13

 

@@ -1258,8 +1258,8 @@
 
CdIcc *
 cd_profile_load_icc (CdProfile *profile,
                      CdIccLoadFlags flags,
-                     GCancellable *cancellable,
-                     GError **error);

+                     GCancellable *cancellable,
+                     GError **error);

 
Loads a local ICC object from the abstract profile.

 

 
Parameters

@@ -1282,12 +1282,12 @@
 
 

-
+
-
+
@@ -1295,7 +1295,7 @@
 

 
Returns

-
 A new CdIcc object, or NULL for error. 

+
 A new CdIcc object, or NULL for error. 

 
[transfer full]

 
Since: 0.1.32

@@ -1321,6 +1321,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-profile-sync.html colord-1.3.3/doc/api/html/colord-cd-profile-sync.html
--- colord-1.3.2/doc/api/html/colord-cd-profile-sync.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-profile-sync.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -41,7 +41,7 @@
 
-
+
-
+
@@ -112,19 +112,19 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.8

 
cd_profile_set_property_sync ()

-
gboolean
+
gboolean
 cd_profile_set_property_sync (CdProfile *profile,
-                              const gchar *key,
-                              const gchar *value,
-                              GCancellable *cancellable,
-                              GError **error);

+                              const gchar *key,
+                              const gchar *value,
+                              GCancellable *cancellable,
+                              GError **error);

 
Sets properties on an object

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -154,12 +154,12 @@
 
 

-
+
-
+
@@ -167,17 +167,17 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.8

 
cd_profile_install_system_wide_sync ()

-
gboolean
+
gboolean
 cd_profile_install_system_wide_sync (CdProfile *profile,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     GCancellable *cancellable,
+                                     GError **error);

 
Sets the profile system wide.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -197,12 +197,12 @@
 
 

-
+
-
+
@@ -210,7 +210,7 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.8

@@ -220,6 +220,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-sensor.html colord-1.3.3/doc/api/html/colord-cd-sensor.html
--- colord-1.3.2/doc/api/html/colord-cd-sensor.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-sensor.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -41,7 +41,7 @@
 
-
-
-
-
-
-
-
-
+
@@ -430,10 +430,10 @@
 

 
cd_sensor_connect_finish ()

-
gboolean
+
gboolean
 cd_sensor_connect_finish (CdSensor *sensor,
-                          GAsyncResult *res,
-                          GError **error);

+                          GAsyncResult *res,
+                          GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -451,12 +451,12 @@
 

-
+
-
+
@@ -464,7 +464,7 @@
 

 
Returns

-
 TRUE if we could connect to to the sensor

+
 TRUE if we could connect to to the sensor

 
Since: 0.1.8

@@ -473,9 +473,9 @@
 
cd_sensor_lock ()
void
 cd_sensor_lock (CdSensor *sensor,
-                GCancellable *cancellable,
-                GAsyncReadyCallback callback,
-                gpointer user_data);

+                GCancellable *cancellable,
+                GAsyncReadyCallback callback,
+                gpointer user_data);
Locks the device so we can use it.

 
Parameters

@@ -493,7 +493,7 @@
 
 

-
+
@@ -515,10 +515,10 @@
 

 
cd_sensor_lock_finish ()

-
gboolean
+
gboolean
 cd_sensor_lock_finish (CdSensor *sensor,
-                       GAsyncResult *res,
-                       GError **error);

+                       GAsyncResult *res,
+                       GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -536,12 +536,12 @@
 

-
+
-
+
@@ -558,9 +558,9 @@
 
cd_sensor_unlock ()
void
 cd_sensor_unlock (CdSensor *sensor,
-                  GCancellable *cancellable,
-                  GAsyncReadyCallback callback,
-                  gpointer user_data);

+                  GCancellable *cancellable,
+                  GAsyncReadyCallback callback,
+                  gpointer user_data);
Unlocks the sensor for use by other programs.

 
Parameters

@@ -578,7 +578,7 @@
 
 

-
+
@@ -600,10 +600,10 @@
 

 
cd_sensor_unlock_finish ()

-
gboolean
+
gboolean
 cd_sensor_unlock_finish (CdSensor *sensor,
-                         GAsyncResult *res,
-                         GError **error);

+                         GAsyncResult *res,
+                         GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -621,12 +621,12 @@
 

-
+
-
+
@@ -643,10 +643,10 @@
 
cd_sensor_set_options ()
void
 cd_sensor_set_options (CdSensor *sensor,
-                       GHashTable *values,
-                       GCancellable *cancellable,
-                       GAsyncReadyCallback callback,
-                       gpointer user_data);

+                       GHashTable *values,
+                       GCancellable *cancellable,
+                       GAsyncReadyCallback callback,
+                       gpointer user_data);
Sets options on the sensor device.

 
Parameters

@@ -669,7 +669,7 @@
 
 

-
+
@@ -691,10 +691,10 @@
 

 
cd_sensor_set_options_finish ()

-
gboolean
+
gboolean
 cd_sensor_set_options_finish (CdSensor *sensor,
-                              GAsyncResult *res,
-                              GError **error);

+                              GAsyncResult *res,
+                              GError **error);

 
Gets the result from the asynchronous function.

 

 
Parameters

@@ -712,12 +712,12 @@
 

-
+
-
+
@@ -735,9 +735,9 @@
 
void
 cd_sensor_get_sample (CdSensor *sensor,
                       CdSensorCap cap,
-                      GCancellable *cancellable,
-                      GAsyncReadyCallback callback,
-                      gpointer user_data);

+                      GCancellable *cancellable,
+                      GAsyncReadyCallback callback,
+                      gpointer user_data);
Gets a color sample from a sensor

 
Parameters

@@ -760,7 +760,7 @@
 
 

-
+
@@ -784,8 +784,8 @@
 
cd_sensor_get_sample_finish ()
CdColorXYZ *
 cd_sensor_get_sample_finish (CdSensor *sensor,
-                             GAsyncResult *res,
-                             GError **error);

+                             GAsyncResult *res,
+                             GError **error);
Gets the result from the asynchronous function.

 
Parameters

@@ -803,12 +803,12 @@
 

-
+
-
+
@@ -816,14 +816,14 @@
 

 
Returns

-
 the XYZ reading, or NULL

+
 the XYZ reading, or NULL

 
Since: 0.1.8

 
cd_sensor_get_object_path ()

-
const gchar *
+
const gchar *
 cd_sensor_get_object_path (CdSensor *sensor);

 
Gets the object path for the sensor.

 

@@ -843,14 +843,14 @@
 

 

 
Returns

-
 the object path, or NULL

+
 the object path, or NULL

 

 
Since: 0.1.6

 

 
cd_sensor_get_id ()

-
const gchar *
+
const gchar *
 cd_sensor_get_id (CdSensor *sensor);

 
Gets the object ID for the sensor.

 

@@ -870,14 +870,14 @@
 

 

 
Returns

-
 the object ID, or NULL

+
 the object ID, or NULL

 

 
Since: 0.1.26

 

 
cd_sensor_get_connected ()

-
gboolean
+
gboolean
 cd_sensor_get_connected (CdSensor *sensor);

 
Gets if the sensor has been connected.

 

@@ -897,7 +897,7 @@
 

 

 
Returns

-
 TRUE if properties are valid

+
 TRUE if properties are valid

 

 
Since: 0.1.9

 

@@ -985,7 +985,7 @@
 

 
cd_sensor_get_serial ()

-
const gchar *
+
const gchar *
 cd_sensor_get_serial (CdSensor *sensor);

 
Gets the sensor serial number.

 

@@ -1005,14 +1005,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.6

 

 
cd_sensor_get_model ()

-
const gchar *
+
const gchar *
 cd_sensor_get_model (CdSensor *sensor);

 
Gets the sensor model.

 

@@ -1032,14 +1032,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.6

 

 
cd_sensor_get_vendor ()

-
const gchar *
+
const gchar *
 cd_sensor_get_vendor (CdSensor *sensor);

 
Gets the sensor vendor.

 

@@ -1059,14 +1059,14 @@
 

 

 
Returns

-
 A string, or NULL for invalid

+
 A string, or NULL for invalid

 

 
Since: 0.1.6

 

 
cd_sensor_get_native ()

-
gboolean
+
gboolean
 cd_sensor_get_native (CdSensor *sensor);

 
Returns if the sensor has a native driver.

 

@@ -1086,14 +1086,14 @@
 

 

 
Returns

-
 TRUE if VCGT is valid.

+
 TRUE if VCGT is valid.

 

 
Since: 0.1.6

 

 
cd_sensor_get_embedded ()

-
gboolean
+
gboolean
 cd_sensor_get_embedded (CdSensor *sensor);

 
Returns if the sensor is embedded into the computer.

 

@@ -1113,14 +1113,14 @@
 

 

 
Returns

-
 TRUE if embedded.

+
 TRUE if embedded.

 

 
Since: 0.1.26

 

 
cd_sensor_get_locked ()

-
gboolean
+
gboolean
 cd_sensor_get_locked (CdSensor *sensor);

 
Returns if the sensor is locked.

 

@@ -1140,14 +1140,14 @@
 

 

 
Returns

-
 TRUE if VCGT is valid.

+
 TRUE if VCGT is valid.

 

 
Since: 0.1.6

 

 
cd_sensor_get_caps ()

-
guint64
+
guint64
 cd_sensor_get_caps (CdSensor *sensor);

 
Returns the sensor metadata.

 

@@ -1174,7 +1174,7 @@
 

 

 
cd_sensor_has_cap ()

-
gboolean
+
gboolean
 cd_sensor_has_cap (CdSensor *sensor,
                    CdSensorCap cap);

 
Returns the sensor metadata for a specific key.

@@ -1202,14 +1202,14 @@
 

 

 
Returns

-
 TRUE if the sensor has the specified capability

+
 TRUE if the sensor has the specified capability

 

 
Since: 0.1.6

 

 

 

 
cd_sensor_get_options ()

-
GHashTable *
+
GHashTable *
 cd_sensor_get_options (CdSensor *sensor);

 
Gets any sensor options.

 

@@ -1230,7 +1230,7 @@
 

 
Returns

 
 A
-refcounted GHashTable of (string, GVariant). 

+refcounted GHashTable of (string, GVariant). 

 
[transfer container][element-type utf8 GVariant]

 

 
Since: 0.1.20

@@ -1238,9 +1238,9 @@
 

 

 
cd_sensor_get_option ()

-
const gchar *
+
const gchar *
 cd_sensor_get_option (CdSensor *sensor,
-                      const gchar *key);

+                      const gchar *key);

 
Gets a specific sensor option.

 

 
Parameters

@@ -1266,14 +1266,14 @@
 

 

 
Returns

-
 A const string, or NULL of not found.

+
 A const string, or NULL of not found.

 

 
Since: 0.1.20

 

 

 

 
cd_sensor_get_metadata ()

-
GHashTable *
+
GHashTable *
 cd_sensor_get_metadata (CdSensor *sensor);

 
Returns the sensor metadata.

 

@@ -1294,7 +1294,7 @@
 

 
Returns

 
 a
-GHashTable. 

+GHashTable. 

 
[transfer container][element-type utf8 utf8]

 

 
Since: 0.1.28

@@ -1302,9 +1302,9 @@
 

 

 
cd_sensor_get_metadata_item ()

-
const gchar *
+
const gchar *
 cd_sensor_get_metadata_item (CdSensor *sensor,
-                             const gchar *key);

+                             const gchar *key);

 
Returns the sensor metadata for a specific key.

 

 
Parameters

@@ -1330,7 +1330,7 @@
 

 

 
Returns

-
 the metadata value, or NULL if not set.

+
 the metadata value, or NULL if not set.

 

 
Since: 0.1.28

 

@@ -1339,7 +1339,7 @@
 
cd_sensor_set_object_path ()

 
void
 cd_sensor_set_object_path (CdSensor *sensor,
-                           const gchar *object_path);

+                           const gchar *object_path);

 
Sets the object path of the sensor.

 

 
Parameters

@@ -1368,7 +1368,7 @@
 

 

 
cd_sensor_equal ()

-
gboolean
+
gboolean
 cd_sensor_equal (CdSensor *sensor1,
                  CdSensor *sensor2);

 
Tests two sensors for equality.

@@ -1396,14 +1396,14 @@
 

 

 
Returns

-
 TRUE if the sensors are the same device

+
 TRUE if the sensors are the same device

 

 
Since: 0.1.8

 

 

 

 
cd_sensor_to_string ()

-
gchar *
+
gchar *
 cd_sensor_to_string (CdSensor *sensor);

 

 

@@ -1429,6 +1429,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-sensor-sync.html colord-1.3.3/doc/api/html/colord-cd-sensor-sync.html
--- colord-1.3.2/doc/api/html/colord-cd-sensor-sync.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-sensor-sync.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 

-
+
-
+
@@ -128,17 +128,17 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.8

 
cd_sensor_lock_sync ()

-
gboolean
+
gboolean
 cd_sensor_lock_sync (CdSensor *sensor,
-                     GCancellable *cancellable,
-                     GError **error);

+                     GCancellable *cancellable,
+                     GError **error);

 
Locks the device so we can use it.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -158,12 +158,12 @@
 
 

-
+
-
+
@@ -171,17 +171,17 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.6

 
cd_sensor_unlock_sync ()

-
gboolean
+
gboolean
 cd_sensor_unlock_sync (CdSensor *sensor,
-                       GCancellable *cancellable,
-                       GError **error);

+                       GCancellable *cancellable,
+                       GError **error);

 
Unlocks the device for use by other programs.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -201,12 +201,12 @@
 
 

-
+
-
+
@@ -214,18 +214,18 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.6

 
cd_sensor_set_options_sync ()

-
gboolean
+
gboolean
 cd_sensor_set_options_sync (CdSensor *sensor,
-                            GHashTable *values,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GHashTable *values,
+                            GCancellable *cancellable,
+                            GError **error);

 
Sets options on the sensor device.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -250,12 +250,12 @@
 
 

-
+
-
+
@@ -263,7 +263,7 @@
 

 
Returns

-
 TRUE for success, else FALSE.

+
 TRUE for success, else FALSE.

 
Since: 0.1.20

@@ -273,8 +273,8 @@
 
CdColorXYZ *
 cd_sensor_get_sample_sync (CdSensor *sensor,
                            CdSensorCap cap,
-                           GCancellable *cancellable,
-                           GError **error);

+                           GCancellable *cancellable,
+                           GError **error);
Gets a sample from the sensor.
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -299,12 +299,12 @@
 
-
+
-
+
@@ -312,7 +312,7 @@
 

 
Returns

-
 the XYZ reading, with ambient levels in Lux encoded in X, or NULL for error.

+
 the XYZ reading, with ambient levels in Lux encoded in X, or NULL for error.

 
Since: 0.1.8

@@ -322,6 +322,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-spectrum.html colord-1.3.3/doc/api/html/colord-cd-spectrum.html
--- colord-1.3.2/doc/api/html/colord-cd-spectrum.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-spectrum.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -97,7 +97,7 @@
 
-
-
+
@@ -388,7 +388,7 @@
 
-
+
@@ -506,7 +506,7 @@
 
-
+
@@ -605,7 +605,7 @@
 
cd_transform_set_bpc ()
void
 cd_transform_set_bpc (CdTransform *transform,
-                      gboolean bpc);

+                      gboolean bpc);
Sets if black point compensation should be used for the transform.

 
Parameters

@@ -634,7 +634,7 @@
 

 

 
cd_transform_get_bpc ()

-
gboolean
+
gboolean
 cd_transform_get_bpc (CdTransform *transform);

 
Gets the rendering bpc to use for the transform.

 

@@ -663,7 +663,7 @@
 
cd_transform_set_max_threads ()

 
void
 cd_transform_set_max_threads (CdTransform *transform,
-                              guint max_threads);

+                              guint max_threads);

 
Sets the maximum number of threads to be used for the transform.

 

 
Parameters

@@ -692,7 +692,7 @@
 

 

 
cd_transform_get_max_threads ()

-
guint
+
guint
 cd_transform_get_max_threads (CdTransform *transform);

 
Gets the maximum number of threads to be used for the transform.

 

@@ -719,15 +719,15 @@
 

 

 
cd_transform_process ()

-
gboolean
+
gboolean
 cd_transform_process (CdTransform *transform,
-                      gpointer data_in,
-                      gpointer data_out,
-                      guint width,
-                      guint height,
-                      guint rowstride,
-                      GCancellable *cancellable,
-                      GError **error);

+                      gpointer data_in,
+                      gpointer data_out,
+                      guint width,
+                      guint height,
+                      guint rowstride,
+                      GCancellable *cancellable,
+                      GError **error);

 
Processes a block of data through the transform.
 Once the transform has been setup it is cached and only re-created if any
 of the formats, input, output or abstract profiles are changed.

@@ -777,12 +777,12 @@
 
 

-
+
-
+
@@ -790,7 +790,7 @@
 

 
Returns

-
 TRUE if the pixels were successfully transformed.

+
 TRUE if the pixels were successfully transformed.

 
Since: 0.1.34

@@ -852,6 +852,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-version.html colord-1.3.3/doc/api/html/colord-cd-version.html
--- colord-1.3.2/doc/api/html/colord-cd-version.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-version.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -109,6 +109,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/ColorManager.html colord-1.3.3/doc/api/html/ColorManager.html
--- colord-1.3.2/doc/api/html/ColorManager.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/ColorManager.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -1053,6 +1053,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/Device.html colord-1.3.3/doc/api/html/Device.html
--- colord-1.3.2/doc/api/html/Device.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/Device.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -754,6 +754,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/index.html colord-1.3.3/doc/api/html/index.html
--- colord-1.3.2/doc/api/html/index.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/index.html	2016-07-27 13:05:09.000000000 +0000
@@ -6,7 +6,7 @@
 
-
+
@@ -22,7 +22,7 @@
             

           

-
Version 1.3.2
+
Version 1.3.3
 

 
Copyright © 2011 The colord authors

 

@@ -155,6 +155,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/ix01.html colord-1.3.3/doc/api/html/ix01.html
--- colord-1.3.2/doc/api/html/ix01.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/ix01.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -1428,6 +1428,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/libcolord.html colord-1.3.3/doc/api/html/libcolord.html
--- colord-1.3.2/doc/api/html/libcolord.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/libcolord.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -62,6 +62,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/libcolordprivate.html colord-1.3.3/doc/api/html/libcolordprivate.html
--- colord-1.3.2/doc/api/html/libcolordprivate.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/libcolordprivate.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -83,6 +83,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/license.html colord-1.3.3/doc/api/html/license.html
--- colord-1.3.2/doc/api/html/license.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/license.html	2016-07-27 13:05:09.000000000 +0000
@@ -7,7 +7,7 @@
 
-
+
@@ -367,6 +367,6 @@
     

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/Profile.html colord-1.3.3/doc/api/html/Profile.html
--- colord-1.3.2/doc/api/html/Profile.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/Profile.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -416,6 +416,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/ref-dbus.html colord-1.3.3/doc/api/html/ref-dbus.html
--- colord-1.3.2/doc/api/html/ref-dbus.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/ref-dbus.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -72,6 +72,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/Sensor.html colord-1.3.3/doc/api/html/Sensor.html
--- colord-1.3.2/doc/api/html/Sensor.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/Sensor.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -528,6 +528,6 @@
 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/Makefile.am colord-1.3.3/doc/api/Makefile.am
--- colord-1.3.2/doc/api/Makefile.am	2015-04-22 09:56:49.000000000 +0000
+++ colord-1.3.3/doc/api/Makefile.am	2016-07-21 07:03:19.000000000 +0000
@@ -13,7 +13,7 @@
 SCAN_OPTIONS=--ignore-headers=config.h
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../lib/colord
+DOC_SOURCE_DIR=$(top_srcdir)/lib/colord $(top_builddir)/lib/colord
 
 # Used for dependencies
 HFILE_GLOB=
@@ -23,6 +23,9 @@
 IGNORE_HFILES= \
 	config.h
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(top_srcdir)"
+
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 AM_CPPFLAGS = \
@@ -46,6 +49,7 @@
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files =  				\
+	../../COPYING				\
 	version.xml				\
 	dbus/org.freedesktop.ColorManager.ref.xml
 
diff -Nru colord-1.3.2/doc/api/Makefile.in colord-1.3.3/doc/api/Makefile.in
--- colord-1.3.2/doc/api/Makefile.in	2016-02-17 13:32:56.000000000 +0000
+++ colord-1.3.3/doc/api/Makefile.in	2016-07-27 13:03:01.000000000 +0000
@@ -433,7 +433,7 @@
 SCAN_OPTIONS = --ignore-headers=config.h
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR = ../../lib/colord
+DOC_SOURCE_DIR = $(top_srcdir)/lib/colord $(top_builddir)/lib/colord
 
 # Used for dependencies
 HFILE_GLOB = 
@@ -444,6 +444,9 @@
 	config.h
 
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS = --path="$(top_srcdir)"
+
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 AM_CPPFLAGS = \
@@ -468,6 +471,7 @@
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = \
+	../../COPYING				\
 	version.xml				\
 	dbus/org.freedesktop.ColorManager.ref.xml
 
@@ -809,11 +813,11 @@
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@ENABLE_GTK_DOC_FALSE@install-data-local:
 @ENABLE_GTK_DOC_FALSE@uninstall-local:
 @ENABLE_GTK_DOC_FALSE@clean-local:
-@ENABLE_GTK_DOC_FALSE@install-data-local:
-@ENABLE_GTK_DOC_FALSE@distclean-local:
 @ENABLE_GTK_DOC_FALSE@maintainer-clean-local:
+@ENABLE_GTK_DOC_FALSE@distclean-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-local mostlyclean-am
diff -Nru colord-1.3.2/doc/api/version.xml colord-1.3.3/doc/api/version.xml
--- colord-1.3.2/doc/api/version.xml	2016-02-17 13:32:58.000000000 +0000
+++ colord-1.3.3/doc/api/version.xml	2016-07-11 15:00:42.000000000 +0000
@@ -1 +1 @@
-1.3.2
+1.3.3
diff -Nru colord-1.3.2/lib/colord/cd-device.c colord-1.3.3/lib/colord/cd-device.c
--- colord-1.3.2/lib/colord/cd-device.c	2016-03-15 12:25:50.000000000 +0000
+++ colord-1.3.3/lib/colord/cd-device.c	2016-04-18 19:54:35.000000000 +0000
@@ -2235,7 +2235,6 @@
 {
 	CdDevice *device = CD_DEVICE (object);
 	CdDevicePrivate *priv = GET_PRIVATE (device);
-	guint ret;
 
 	g_return_if_fail (CD_IS_DEVICE (object));
 
@@ -2249,17 +2248,8 @@
 	g_free (priv->vendor);
 	g_strfreev (priv->profiling_inhibitors);
 	g_ptr_array_unref (priv->profiles);
-	if (priv->proxy != NULL) {
-		ret = g_signal_handlers_disconnect_by_func (priv->proxy,
-							    G_CALLBACK (cd_device_dbus_signal_cb),
-							    device);
-//		g_assert (ret > 0);
-		ret = g_signal_handlers_disconnect_by_func (priv->proxy,
-							    G_CALLBACK (cd_device_dbus_properties_changed_cb),
-							    device);
-//		g_assert (ret > 0);
+	if (priv->proxy != NULL)
 		g_object_unref (priv->proxy);
-	}
 
 	G_OBJECT_CLASS (cd_device_parent_class)->finalize (object);
 }
diff -Nru colord-1.3.2/lib/colord/cd-profile.c colord-1.3.3/lib/colord/cd-profile.c
--- colord-1.3.2/lib/colord/cd-profile.c	2016-03-15 12:26:34.000000000 +0000
+++ colord-1.3.3/lib/colord/cd-profile.c	2016-04-18 19:54:35.000000000 +0000
@@ -1489,15 +1489,8 @@
 	g_free (priv->format);
 	g_free (priv->title);
 	g_strfreev (priv->warnings);
-	if (priv->proxy != NULL) {
-		g_signal_handlers_disconnect_by_func (priv->proxy,
-						      G_CALLBACK (cd_profile_dbus_signal_cb),
-						      profile);
-		g_signal_handlers_disconnect_by_func (priv->proxy,
-						      G_CALLBACK (cd_profile_dbus_properties_changed_cb),
-						      profile);
+	if (priv->proxy != NULL)
 		g_object_unref (priv->proxy);
-	}
 
 	G_OBJECT_CLASS (cd_profile_parent_class)->finalize (object);
 }
diff -Nru colord-1.3.2/lib/colord/cd-sensor.c colord-1.3.3/lib/colord/cd-sensor.c
--- colord-1.3.2/lib/colord/cd-sensor.c	2016-03-15 12:26:52.000000000 +0000
+++ colord-1.3.3/lib/colord/cd-sensor.c	2016-04-18 19:54:35.000000000 +0000
@@ -1612,7 +1612,6 @@
 {
 	CdSensor *sensor = CD_SENSOR (object);
 	CdSensorPrivate *priv = GET_PRIVATE (sensor);
-	guint ret;
 
 	g_return_if_fail (CD_IS_SENSOR (object));
 
@@ -1623,17 +1622,8 @@
 	g_free (priv->vendor);
 	g_hash_table_unref (priv->options);
 	g_hash_table_destroy (priv->metadata);
-	if (priv->proxy != NULL) {
-		ret = g_signal_handlers_disconnect_by_func (priv->proxy,
-							    G_CALLBACK (cd_sensor_dbus_signal_cb),
-							    sensor);
-		g_assert (ret > 0);
-		ret = g_signal_handlers_disconnect_by_func (priv->proxy,
-							    G_CALLBACK (cd_sensor_dbus_properties_changed_cb),
-							    sensor);
-		g_assert (ret > 0);
+	if (priv->proxy != NULL)
 		g_object_unref (priv->proxy);
-	}
 
 	G_OBJECT_CLASS (cd_sensor_parent_class)->finalize (object);
 }
diff -Nru colord-1.3.2/lib/colord/cd-version.h colord-1.3.3/lib/colord/cd-version.h
--- colord-1.3.2/lib/colord/cd-version.h	2016-02-17 13:32:58.000000000 +0000
+++ colord-1.3.3/lib/colord/cd-version.h	2016-07-11 15:00:42.000000000 +0000
@@ -55,7 +55,7 @@
  *
  * The compile-time micro version
  */
-#define CD_MICRO_VERSION				(2)
+#define CD_MICRO_VERSION				(3)
 
 /**
  * CD_CHECK_VERSION:
diff -Nru colord-1.3.2/lib/colorhug/ch-version.h colord-1.3.3/lib/colorhug/ch-version.h
--- colord-1.3.2/lib/colorhug/ch-version.h	2016-02-17 13:32:58.000000000 +0000
+++ colord-1.3.3/lib/colorhug/ch-version.h	2016-07-11 15:00:42.000000000 +0000
@@ -30,7 +30,7 @@
  */
 #define CH_MAJOR_VERSION				(1)
 #define CH_MINOR_VERSION				(3)
-#define CH_MICRO_VERSION				(2)
+#define CH_MICRO_VERSION				(3)
 
 /* check whether a Ch version equal to or greater than
  * major.minor.micro.
diff -Nru colord-1.3.2/NEWS colord-1.3.3/NEWS
--- colord-1.3.2/NEWS	2016-03-21 11:37:30.000000000 +0000
+++ colord-1.3.3/NEWS	2016-07-27 13:02:28.000000000 +0000
@@ -1,3 +1,14 @@
+Version 1.3.3
+~~~~~~~~~~~~~
+Released: 2016-07-27
+
+Bugfixes:
+ - Check polkit version before defining g_autoptr macros (Emmanuele Bassi)
+ - Fix an assert failure when connecting to sensors (Richard Hughes)
+ - Fix gtk-doc build when srcdir != builddir (Ting-Wei Lan)
+ - Increase timeout to 60s for argyll spotread sampling (Kjell Irgens)
+ - Use the USB path to match the ArgyllCMS port (Richard Hughes)
+
 Version 1.3.2
 ~~~~~~~~~~~~~
 Released: 2016-03-21
diff -Nru colord-1.3.2/po/de.po colord-1.3.3/po/de.po
--- colord-1.3.2/po/de.po	2015-12-02 10:29:59.000000000 +0000
+++ colord-1.3.3/po/de.po	2016-07-27 13:03:21.000000000 +0000
@@ -15,9 +15,9 @@
 msgstr ""
 "Project-Id-Version: colord\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 15:21+0000\n"
-"PO-Revision-Date: 2015-11-27 15:21+0000\n"
-"Last-Translator: Richard Hughes \n"
+"POT-Creation-Date: 2016-07-27 14:03+0100\n"
+"PO-Revision-Date: 2016-06-02 20:15+0000\n"
+"Last-Translator: Christian \n"
 "Language-Team: German (http://www.transifex.com/hughsie/colord/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -276,7 +276,7 @@
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Dark Calibration"
-msgstr ""
+msgstr "Kalibrierung von schwarz"
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Irradiance Calibration"
@@ -284,7 +284,7 @@
 
 #. TRANSLATORS: this is the sensor capability
 msgid "Spectral"
-msgstr ""
+msgstr "Spektral"
 
 #. TRANSLATORS: this is the display technology,
 #. * where LCD stands for 'Liquid Crystal Display'
@@ -380,21 +380,21 @@
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Put the device in a dark place and press enter."
-msgstr ""
+msgstr "Platzieren Sie das Gerät an einem dunklen Ort und drücken Sie die Eingabetaste."
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Calibrate with a 3200K light source."
-msgstr ""
+msgstr "Kalibrieren Sie mit einer 3200K Lichtquelle."
 
 msgid "Put the device on the color to be measured and press enter."
-msgstr ""
+msgstr "Platzieren Sie das Gerät auf die zu messende Farbe und drücken Sie die Eingabetaste."
 
 msgid "Color"
 msgstr "Farbe"
 
 #. TRANSLATORS: sensor can't do this
 msgid "No spectral capability"
-msgstr ""
+msgstr "Keine Spektralfähigkeit"
 
 #. TRANSLATORS: command line option
 msgid "Show client and daemon versions"
@@ -430,7 +430,7 @@
 
 #. TRANSLATORS: command description
 msgid "Gets a spectral reading from a sensor"
-msgstr ""
+msgstr "Ermittelt einen Spektralmesswert von einem Sensor"
 
 #. TRANSLATORS: command description
 msgid "Gets a reading from a sensor"
diff -Nru colord-1.3.2/po/hu.po colord-1.3.3/po/hu.po
--- colord-1.3.2/po/hu.po	2015-12-02 10:29:59.000000000 +0000
+++ colord-1.3.3/po/hu.po	2016-07-27 13:03:21.000000000 +0000
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Balázs Meskó , 2016
 # Balázs Úr , 2014-2015
 # Gabor Kelemen , 2012
 # kelemeng , 2012
@@ -15,9 +16,9 @@
 msgstr ""
 "Project-Id-Version: colord\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 15:21+0000\n"
-"PO-Revision-Date: 2015-11-27 15:21+0000\n"
-"Last-Translator: Richard Hughes \n"
+"POT-Creation-Date: 2016-07-27 14:03+0100\n"
+"PO-Revision-Date: 2016-03-25 12:59+0000\n"
+"Last-Translator: Balázs Meskó \n"
 "Language-Team: Hungarian (http://www.transifex.com/hughsie/colord/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -276,15 +277,15 @@
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Dark Calibration"
-msgstr ""
+msgstr "Sötét kalibráció"
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Irradiance Calibration"
-msgstr ""
+msgstr "Besugárzás kalibráció"
 
 #. TRANSLATORS: this is the sensor capability
 msgid "Spectral"
-msgstr ""
+msgstr "Spektrális"
 
 #. TRANSLATORS: this is the display technology,
 #. * where LCD stands for 'Liquid Crystal Display'
@@ -380,21 +381,21 @@
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Put the device in a dark place and press enter."
-msgstr ""
+msgstr "Tegye az eszköz egy sötét helyre és nyomjon entert."
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Calibrate with a 3200K light source."
-msgstr ""
+msgstr "Kalibrálás egy 3200k fényforrással."
 
 msgid "Put the device on the color to be measured and press enter."
-msgstr ""
+msgstr "Tegye az eszközt a kimérendő színre és nyomjon entert."
 
 msgid "Color"
 msgstr "Szín"
 
 #. TRANSLATORS: sensor can't do this
 msgid "No spectral capability"
-msgstr ""
+msgstr "Nincs spektrális képesség"
 
 #. TRANSLATORS: command line option
 msgid "Show client and daemon versions"
@@ -430,7 +431,7 @@
 
 #. TRANSLATORS: command description
 msgid "Gets a spectral reading from a sensor"
-msgstr ""
+msgstr "Spektrális adatok lekérése egy érzékelőtől"
 
 #. TRANSLATORS: command description
 msgid "Gets a reading from a sensor"
diff -Nru colord-1.3.2/po/id.po colord-1.3.3/po/id.po
--- colord-1.3.2/po/id.po	2016-03-21 11:47:05.000000000 +0000
+++ colord-1.3.3/po/id.po	2016-07-27 13:03:20.000000000 +0000
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Andika Triwidada , 2011-2012,2014-2015
+# Andika Triwidada , 2011-2012,2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: colord\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-21 11:47+0000\n"
-"PO-Revision-Date: 2015-12-10 07:07+0000\n"
+"POT-Creation-Date: 2016-07-27 14:03+0100\n"
+"PO-Revision-Date: 2016-07-25 10:16+0000\n"
 "Last-Translator: Andika Triwidada \n"
 "Language-Team: Indonesian (http://www.transifex.com/hughsie/colord/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -168,7 +168,7 @@
 
 #. TRANSLATORS: if the profile is installed for all users
 msgid "System Wide"
-msgstr ""
+msgstr "Seluruh Sistem"
 
 #. TRANSLATORS: profile filename
 msgid "Filename"
diff -Nru colord-1.3.2/po/ko.po colord-1.3.3/po/ko.po
--- colord-1.3.2/po/ko.po	2015-12-02 10:29:59.000000000 +0000
+++ colord-1.3.3/po/ko.po	2016-07-27 13:03:21.000000000 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Seong-ho Cho , 2012,2015
+# Seong-ho Cho , 2012,2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: colord\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 15:21+0000\n"
-"PO-Revision-Date: 2015-11-27 15:21+0000\n"
-"Last-Translator: Richard Hughes \n"
+"POT-Creation-Date: 2016-07-27 14:03+0100\n"
+"PO-Revision-Date: 2016-04-07 10:10+0000\n"
+"Last-Translator: Seong-ho Cho \n"
 "Language-Team: Korean (http://www.transifex.com/hughsie/colord/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -373,21 +373,21 @@
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Put the device in a dark place and press enter."
-msgstr ""
+msgstr "어두운 색 영역에 장치를 올려둔 후 엔터 키를 누르십시오."
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Calibrate with a 3200K light source."
-msgstr ""
+msgstr "3200K 광원으로 보정합니다."
 
 msgid "Put the device on the color to be measured and press enter."
-msgstr ""
+msgstr "측정할 색상에 장치를 올려둔 후 엔터 키를 누르십시오."
 
 msgid "Color"
 msgstr "색상"
 
 #. TRANSLATORS: sensor can't do this
 msgid "No spectral capability"
-msgstr ""
+msgstr "스펙트럼 기능 없음"
 
 #. TRANSLATORS: command line option
 msgid "Show client and daemon versions"
@@ -423,7 +423,7 @@
 
 #. TRANSLATORS: command description
 msgid "Gets a spectral reading from a sensor"
-msgstr ""
+msgstr "센서에서 스펙트럼 정보를 가져옵니다"
 
 #. TRANSLATORS: command description
 msgid "Gets a reading from a sensor"
diff -Nru colord-1.3.2/po/tr.po colord-1.3.3/po/tr.po
--- colord-1.3.2/po/tr.po	2015-12-02 10:29:59.000000000 +0000
+++ colord-1.3.3/po/tr.po	2016-07-27 13:03:21.000000000 +0000
@@ -5,15 +5,16 @@
 # Translators:
 # Caner Başaran , 2014
 # Kaan Özdinçer , 2014
+# Muhammet Kara , 2016
 # Necdet Yücel , 2012,2014
 # Onuralp SEZER , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: colord\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 15:21+0000\n"
-"PO-Revision-Date: 2015-11-27 15:21+0000\n"
-"Last-Translator: Richard Hughes \n"
+"POT-Creation-Date: 2016-07-27 14:03+0100\n"
+"PO-Revision-Date: 2016-04-17 20:20+0000\n"
+"Last-Translator: Muhammet Kara \n"
 "Language-Team: Turkish (http://www.transifex.com/hughsie/colord/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -272,7 +273,7 @@
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Dark Calibration"
-msgstr ""
+msgstr "Karanlık Kalibrasyonu"
 
 #. TRANSLATORS: this is the display calibration type
 msgid "Irradiance Calibration"
@@ -376,14 +377,14 @@
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Put the device in a dark place and press enter."
-msgstr ""
+msgstr "Cihazı karanlık bir yere koyun ve enter'a basın."
 
 #. TRANSLATORS: the user needs to change something on the device
 msgid "Calibrate with a 3200K light source."
-msgstr ""
+msgstr "3200K'lık bir ışık kaynağıyla kalibre et."
 
 msgid "Put the device on the color to be measured and press enter."
-msgstr ""
+msgstr "Cihazı ölçülecek rengin üzerine getirin ve enter tuşuna basın."
 
 msgid "Color"
 msgstr "Renk"
diff -Nru colord-1.3.2/src/cd-common.c colord-1.3.3/src/cd-common.c
--- colord-1.3.2/src/cd-common.c	2016-02-17 13:28:15.000000000 +0000
+++ colord-1.3.3/src/cd-common.c	2016-07-07 07:55:11.000000000 +0000
@@ -29,13 +29,11 @@
 
 #include "cd-common.h"
 
-#ifdef USE_POLKIT
-#ifndef PolkitAuthorizationResult_autoptr
+#if defined(USE_POLKIT) && !defined(POLKIT_HAS_AUTOPTR_MACROS)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthorizationResult, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitSubject, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthority, g_object_unref)
 #endif
-#endif
 
 /**
  * cd_client_error_quark:
diff -Nru colord-1.3.2/src/cd-sensor.c colord-1.3.3/src/cd-sensor.c
--- colord-1.3.2/src/cd-sensor.c	2015-10-27 10:16:08.000000000 +0000
+++ colord-1.3.3/src/cd-sensor.c	2016-04-18 19:54:35.000000000 +0000
@@ -105,6 +105,7 @@
 	gboolean			 locked;
 	guint64				 caps;
 	gchar				*object_path;
+	gchar				*usb_path;
 	guint				 watcher_id;
 	GDBusConnection			*connection;
 	guint				 registration_id;
@@ -1307,6 +1308,16 @@
 #endif
 }
 
+/**
+ * cd_sensor_get_usb_path:
+ **/
+const gchar *
+cd_sensor_get_usb_path (CdSensor *sensor)
+{
+	CdSensorPrivate *priv = GET_PRIVATE (sensor);
+	return priv->usb_path;
+}
+
 #ifdef HAVE_GUSB
 /**
  * cd_sensor_open_usb_device:
@@ -1409,6 +1420,8 @@
 	gboolean use_database;
 	gchar *tmp;
 	guint i;
+	guint8 busnum;
+	guint8 devnum;
 
 	/* only use the database if we found both the VID and the PID */
 	use_database = g_udev_device_has_property (device, "ID_VENDOR_FROM_DATABASE") &&
@@ -1490,6 +1503,12 @@
 	 * device changes as this is only a snapshot */
 	priv->device = g_object_ref (device);
 
+	/* create USB path */
+	busnum = g_udev_device_get_sysfs_attr_as_int (priv->device, "busnum");
+	devnum = g_udev_device_get_sysfs_attr_as_int (priv->device, "devnum");
+	priv->usb_path = g_strdup_printf ("/dev/bus/usb/%03i/%03i",
+					  busnum, devnum);
+
 	/* success */
 	return TRUE;
 }
@@ -1758,6 +1777,7 @@
 	g_free (priv->serial);
 	g_free (priv->id);
 	g_free (priv->object_path);
+	g_free (priv->usb_path);
 	g_hash_table_unref (priv->options);
 	g_hash_table_unref (priv->metadata);
 #ifdef HAVE_GUSB
diff -Nru colord-1.3.2/src/cd-sensor.h colord-1.3.3/src/cd-sensor.h
--- colord-1.3.2/src/cd-sensor.h	2015-10-16 11:04:50.000000000 +0000
+++ colord-1.3.3/src/cd-sensor.h	2016-04-18 19:54:35.000000000 +0000
@@ -66,6 +66,7 @@
 const gchar	*cd_sensor_get_id		(CdSensor		*sensor);
 const gchar	*cd_sensor_get_object_path	(CdSensor		*sensor);
 const gchar	*cd_sensor_get_device_path	(CdSensor		*sensor);
+const gchar	*cd_sensor_get_usb_path		(CdSensor		*sensor);
 gboolean	 cd_sensor_register_object	(CdSensor		*sensor,
 						 GDBusConnection	*connection,
 						 GDBusInterfaceInfo	*info,
diff -Nru colord-1.3.2/src/sensors/cd-sensor-argyll.c colord-1.3.3/src/sensors/cd-sensor-argyll.c
--- colord-1.3.2/src/sensors/cd-sensor-argyll.c	2016-03-03 09:40:24.000000000 +0000
+++ colord-1.3.3/src/sensors/cd-sensor-argyll.c	2016-07-06 07:24:17.000000000 +0000
@@ -31,7 +31,7 @@
 #include "cd-sensor.h"
 #include "cd-spawn.h"
 
-#define CD_SENSOR_ARGYLL_MAX_SAMPLE_TIME	10000 /* ms */
+#define CD_SENSOR_ARGYLL_MAX_SAMPLE_TIME	60000 /* ms */
 
 typedef enum {
 	CD_SENSOR_ARGYLL_POS_UNKNOWN,
@@ -358,6 +358,7 @@
 	const gchar *argv[] = { "spotread", "--help", NULL };
 	const gchar *argyll_name;
 	const gchar *envp[] = { "ARGYLL_NOT_INTERACTIVE=1", NULL };
+	const gchar *usb_path;
 	gboolean ret;
 	guint i;
 	guint listno = 0;
@@ -378,23 +379,23 @@
 	if (!ret)
 		return FALSE;
 
-	/* split into lines and search */
-	lines = g_strsplit (stdout, "\n", -1);
+	/* look for the usb /dev/bus/usb/002/003 path first */
+	usb_path = cd_sensor_get_usb_path (sensor);
 	argyll_name = cd_sensor_to_argyll_name (sensor);
-	if (argyll_name == NULL) {
-		g_set_error_literal (error,
-				     CD_SENSOR_ERROR,
-				     CD_SENSOR_ERROR_INTERNAL,
-				     "Failed to find sensor");
-		return FALSE;
-	}
+	lines = g_strsplit (stdout, "\n", -1);
 	for (i = 0; lines[i] != NULL; i++) {
 
 		/* look for the communication port listing of the
 		 * device type we have plugged in */
 		if (g_strstr_len (lines[i], -1, " = ") != NULL) {
 			listno++;
-			if (g_strstr_len (lines[i], -1, argyll_name) != NULL) {
+			if (usb_path != NULL &&
+			    g_strstr_len (lines[i], -1, usb_path) != NULL) {
+				priv->communication_port = listno;
+				break;
+			}
+			if (argyll_name != NULL &&
+			    g_strstr_len (lines[i], -1, argyll_name) != NULL) {
 				priv->communication_port = listno;
 				break;
 			}


 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

 
error
a valid GError, or NULL
a valid GError, or NULL

  
 

 
 
 
 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

 
error
A GError or NULL
A GError or NULL

  
 

 
 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 

 
-gboolean
+gboolean
 
 
 cd_icc_utils_get_coverage ()
@@ -56,11 +56,11 @@
 
Functions

 

 
cd_icc_utils_get_coverage ()

-
gboolean
+
gboolean
 cd_icc_utils_get_coverage (CdIcc *icc,
                            CdIcc *icc_reference,
-                           gdouble *coverage,
-                           GError **error);

+                           gdouble *coverage,
+                           GError **error);

 
Gets the gamut coverage of two profiles where 0.5 would mean the gamut is
 half the size, and 2.0 would indicate the gamut is twice the size.

 

@@ -91,7 +91,7 @@
 

 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-GQuark
+GQuark
 
 
 cd_interp_error_quark ()
@@ -57,7 +57,7 @@
 

 

 
-GArray *
+GArray *
 
 
 cd_interp_get_x ()
@@ -65,7 +65,7 @@
 

 

 
-GArray *
+GArray *
 
 
 cd_interp_get_y ()
@@ -73,7 +73,7 @@
 

 

 
-guint
+guint
 
 
 cd_interp_get_size ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_interp_prepare ()
@@ -97,14 +97,14 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_interp_eval ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_interp_kind_to_string ()
@@ -148,7 +148,7 @@
 
Functions

 

 
cd_interp_error_quark ()

-
GQuark
+
GQuark
 cd_interp_error_quark (void);

 

 
Returns

@@ -186,7 +186,7 @@
 

 

 
cd_interp_get_x ()

-
GArray *
+
GArray *
 cd_interp_get_x (CdInterp *interp);

 
Gets the X data used the interpolation.

 
NOTE: this is only guaranteed to return the data inserted by
@@ -218,7 +218,7 @@
 

 

 
cd_interp_get_y ()

-
GArray *
+
GArray *
 cd_interp_get_y (CdInterp *interp);

 
Gets the Y data used the interpolation.

 
NOTE: this is only guaranteed to return the data inserted by
@@ -250,7 +250,7 @@
 

 

 
cd_interp_get_size ()

-
guint
+
guint
 cd_interp_get_size (CdInterp *interp);

 
Gets the number of items of data added with cd_interp_insert().

 
NOTE: This method has to be called after cd_interp_prepare() and it returns
@@ -283,8 +283,8 @@
 
cd_interp_insert ()

 
void
 cd_interp_insert (CdInterp *interp,
-                  gdouble x,
-                  gdouble y);

+                  gdouble x,
+                  gdouble y);

 
Inserts data to be interpolated.

 

 
Parameters

@@ -318,9 +318,9 @@
 

 

 
cd_interp_prepare ()

-
gboolean
+
gboolean
 cd_interp_prepare (CdInterp *interp,
-                   GError **error);

+                   GError **error);

 
Prepares the data set so that cd_interp_eval() can be used.

 

 
Parameters

@@ -339,17 +339,17 @@
 

 

 
Returns

-
 TRUE for success

+
 TRUE for success

 

 
Since: 0.1.31

 

 

 

 
cd_interp_eval ()

-
gdouble
+
gdouble
 cd_interp_eval (CdInterp *interp,
-                gdouble value,
-                GError **error);

+                gdouble value,
+                GError **error);

 
Evaluate the interpolation function at a specific point.
 You must have called cd_interp_insert() and cd_interp_prepare() before
 calling this method.

@@ -374,7 +374,7 @@
 

 

 
error
a GError or NULL
a GError or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-GQuark
+GQuark
 
 
 cd_it8_error_quark ()
@@ -65,7 +65,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_load_from_data ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_load_from_file ()
@@ -81,7 +81,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_save_to_file ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_save_to_data ()
@@ -216,21 +216,21 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_get_normalized ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_it8_get_originator ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_it8_get_title ()
@@ -238,21 +238,21 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_get_spectral ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_it8_get_instrument ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_it8_get_reference ()
@@ -260,7 +260,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_get_enable_created ()
@@ -268,7 +268,7 @@
 

 

 
-guint
+guint
 
 
 cd_it8_get_data_size ()
@@ -276,7 +276,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_get_data_item ()
@@ -284,7 +284,7 @@
 

 

 
-GPtrArray *
+GPtrArray *
 
 
 cd_it8_get_spectrum_array ()
@@ -300,7 +300,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_has_option ()
@@ -353,7 +353,7 @@
 
Functions

 

 
cd_it8_error_quark ()

-
GQuark
+
GQuark
 cd_it8_error_quark (void);

 

 
Returns

@@ -403,11 +403,11 @@
 

 

 
cd_it8_load_from_data ()

-
gboolean
+
gboolean
 cd_it8_load_from_data (CdIt8 *it8,
-                       const gchar *data,
-                       gsize size,
-                       GError **error);

+                       const gchar *data,
+                       gsize size,
+                       GError **error);

 
Loads a it8 file from data.

 

 
Parameters

@@ -435,7 +435,7 @@
 

 

 
error
a GError, or NULL
a GError, or NULL

  
 

 
 
 
 
 
 

 
file
a GFile
a GFile

  
 

 

 
error
a GError, or NULL
a GError, or NULL

  
 

 
 
 
 
 
 

 
file
a GFile
a GFile

  
 

 

 
error
a GError, or NULL
a GError, or NULL

  
 

 
 
 
 
 
 

 
error
a GError, or NULL
a GError, or NULL

  
 

 
 
 
 
 
 
 

 
rgb
a CdColorRGB, or NULL
a CdColorRGB, or NULL

  
 

 

 
xyz
a CdColorXYZ, or NULL
a CdColorXYZ, or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 

 
-gboolean
+gboolean
 
 
 cd_it8_utils_calculate_ccmx ()
@@ -49,7 +49,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_utils_calculate_xyz_from_cmf ()
@@ -57,7 +57,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_utils_calculate_cri_from_cmf ()
@@ -65,7 +65,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_it8_utils_calculate_gamma ()
@@ -82,11 +82,11 @@
 
Functions

 

 
cd_it8_utils_calculate_ccmx ()

-
gboolean
+
gboolean
 cd_it8_utils_calculate_ccmx (CdIt8 *it8_reference,
                              CdIt8 *it8_measured,
                              CdIt8 *it8_ccmx,
-                             GError **error);

+                             GError **error);

 
This calculates the colorimeter correction matrix using the Four-Color
 Matrix Method by Yoshihiro Ohno and Jonathan E. Hardis, 1997.

 

@@ -115,7 +115,7 @@
 

 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 

 
error
A GError, or NULL
A GError, or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-gdouble
+gdouble
 
 
 cd_vec3_squared_error ()
@@ -89,7 +89,7 @@
 

 

 
-gchar *
+gchar *
 
 
 cd_vec3_to_string ()
@@ -97,7 +97,7 @@
 

 

 
-gdouble *
+gdouble *
 
 
 cd_vec3_get_data ()
@@ -129,7 +129,7 @@
 

 

 
-gchar *
+gchar *
 
 
 cd_mat33_to_string ()
@@ -137,7 +137,7 @@
 

 

 
-gdouble *
+gdouble *
 
 
 cd_mat33_get_data ()
@@ -177,7 +177,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_mat33_reciprocal ()
@@ -185,7 +185,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_mat33_determinant ()
@@ -339,7 +339,7 @@
 
cd_vec3_scalar_multiply ()

 
void
 cd_vec3_scalar_multiply (const CdVec3 *src,
-                         gdouble value,
+                         gdouble value,
                          CdVec3 *dest);

 
Multiplies a vector with a scalar.
 The arguments src
@@ -409,7 +409,7 @@
 

 

 
cd_vec3_squared_error ()

-
gdouble
+
gdouble
 cd_vec3_squared_error (const CdVec3 *src1,
                        const CdVec3 *src2);

 
Gets the mean squared error for a pair of vectors

@@ -443,7 +443,7 @@
 

 

 
cd_vec3_to_string ()

-
gchar *
+
gchar *
 cd_vec3_to_string (const CdVec3 *src);

 
Obtains a string representaton of a vector.

 

@@ -463,13 +463,13 @@
 

 

 
Returns

-
 the string. Free with g_free()

+
 the string. Free with g_free()

 

 

 

 

 
cd_vec3_get_data ()

-
gdouble *
+
gdouble *
 cd_vec3_get_data (const CdVec3 *src);

 
Gets the raw data for the vector.

 

@@ -497,9 +497,9 @@
 
cd_vec3_init ()

 
void
 cd_vec3_init (CdVec3 *dest,
-              gdouble v0,
-              gdouble v1,
-              gdouble v2);

+              gdouble v0,
+              gdouble v1,
+              gdouble v2);

 
Initialises a vector.

 

 
Parameters

@@ -539,15 +539,15 @@
 
cd_mat33_init ()

 
void
 cd_mat33_init (CdMat3x3 *dest,
-               gdouble m00,
-               gdouble m01,
-               gdouble m02,
-               gdouble m10,
-               gdouble m11,
-               gdouble m12,
-               gdouble m20,
-               gdouble m21,
-               gdouble m22);

+               gdouble m00,
+               gdouble m01,
+               gdouble m02,
+               gdouble m10,
+               gdouble m11,
+               gdouble m12,
+               gdouble m20,
+               gdouble m21,
+               gdouble m22);

 
Initialises a matrix.

 

 
Parameters

@@ -637,7 +637,7 @@
 

 

 
cd_mat33_to_string ()

-
gchar *
+
gchar *
 cd_mat33_to_string (const CdMat3x3 *src);

 
Obtains a string representaton of a matrix.

 

@@ -657,13 +657,13 @@
 

 

 
Returns

-
 the string. Free with g_free()

+
 the string. Free with g_free()

 

 

 

 

 
cd_mat33_get_data ()

-
gdouble *
+
gdouble *
 cd_mat33_get_data (const CdMat3x3 *src);

 
Gets the raw data for the matrix.

 

@@ -713,7 +713,7 @@
 
cd_mat33_scalar_multiply ()

 
void
 cd_mat33_scalar_multiply (const CdMat3x3 *mat_src,
-                          gdouble value,
+                          gdouble value,
                           CdMat3x3 *mat_dest);

 
Multiplies a matrix with a scalar.
 The arguments vec_src
@@ -831,7 +831,7 @@
 

 

 
cd_mat33_reciprocal ()

-
gboolean
+
gboolean
 cd_mat33_reciprocal (const CdMat3x3 *src,
                      CdMat3x3 *dest);

 
Inverts the matrix.
@@ -862,13 +862,13 @@
 

 

 
Returns

-
 FALSE if det is zero (singular).

+
 FALSE if det is zero (singular).

 

 

 

 

 
cd_mat33_determinant ()

-
gdouble
+
gdouble
 cd_mat33_determinant (const CdMat3x3 *src);

 
Gets the determinant of the matrix.

 

@@ -982,6 +982,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-profile.html colord-1.3.3/doc/api/html/colord-cd-profile.html
--- colord-1.3.2/doc/api/html/colord-cd-profile.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-profile.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 

 

 
-GQuark
+GQuark
 
 
 cd_profile_error_quark ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_connect_finish ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_set_property_finish ()
@@ -105,49 +105,49 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_install_system_wide_finish ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_id ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_filename ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_qualifier ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_format ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_title ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_object_path ()
@@ -179,7 +179,7 @@
 

 

 
-guint
+guint
 
 
 cd_profile_get_owner ()
@@ -187,7 +187,7 @@
 

 

 
-gchar **
+gchar **
 
 
 cd_profile_get_warnings ()
@@ -195,7 +195,7 @@
 

 

 
-gint64
+gint64
 
 
 cd_profile_get_created ()
@@ -203,7 +203,7 @@
 

 

 
-gint64
+gint64
 
 
 cd_profile_get_age ()
@@ -211,7 +211,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_get_has_vcgt ()
@@ -219,7 +219,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_get_is_system_wide ()
@@ -227,14 +227,14 @@
 

 

 
-GHashTable *
+GHashTable *
 
 
 cd_profile_get_metadata ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_profile_get_metadata_item ()
@@ -250,7 +250,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_get_connected ()
@@ -258,7 +258,7 @@
 

 

 
-gchar *
+gchar *
 
 
 cd_profile_to_string ()
@@ -266,7 +266,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_equal ()
@@ -274,7 +274,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_has_access ()
@@ -320,7 +320,7 @@
 
Functions

 

 
cd_profile_error_quark ()

-
GQuark
+
GQuark
 cd_profile_error_quark (void);

 

 
Returns

@@ -344,7 +344,7 @@
 

 
cd_profile_new_with_object_path ()

 
CdProfile *
-cd_profile_new_with_object_path (const gchar *object_path);

+cd_profile_new_with_object_path (const gchar *object_path);

 
Creates a new CdProfile object with a known object path.

 

 
Parameters

@@ -372,9 +372,9 @@
 
cd_profile_connect ()

 
void
 cd_profile_connect (CdProfile *profile,
-                    GCancellable *cancellable,
-                    GAsyncReadyCallback callback,
-                    gpointer user_data);

+                    GCancellable *cancellable,
+                    GAsyncReadyCallback callback,
+                    gpointer user_data);
 
Connects to the object and fills up initial properties.

 

 
Parameters

@@ -392,7 +392,7 @@
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 

 
cancellable
A GCancellable, or NULL
A GCancellable, or NULL

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 

 
-gboolean
+gboolean
 
 
 cd_profile_connect_sync ()
@@ -49,7 +49,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_set_property_sync ()
@@ -57,7 +57,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_profile_install_system_wide_sync ()
@@ -76,10 +76,10 @@
 
Functions

 

 
cd_profile_connect_sync ()

-
gboolean
+
gboolean
 cd_profile_connect_sync (CdProfile *profile,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

 
Connects to the object and fills up initial properties.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -99,12 +99,12 @@
 

 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-GQuark
+GQuark
 
 
 cd_sensor_error_quark ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_connect_finish ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_lock_finish ()
@@ -105,7 +105,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_unlock_finish ()
@@ -121,7 +121,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_set_options_finish ()
@@ -144,14 +144,14 @@
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_object_path ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_id ()
@@ -159,7 +159,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_get_connected ()
@@ -190,21 +190,21 @@
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_serial ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_model ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_vendor ()
@@ -212,7 +212,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_get_native ()
@@ -220,7 +220,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_get_embedded ()
@@ -228,7 +228,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_get_locked ()
@@ -236,7 +236,7 @@
 

 

 
-guint64
+guint64
 
 
 cd_sensor_get_caps ()
@@ -244,7 +244,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_has_cap ()
@@ -252,14 +252,14 @@
 

 

 
-GHashTable *
+GHashTable *
 
 
 cd_sensor_get_options ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_option ()
@@ -267,14 +267,14 @@
 

 

 
-GHashTable *
+GHashTable *
 
 
 cd_sensor_get_metadata ()
 
 

 
const gchar *
+const gchar *
 
 
 cd_sensor_get_metadata_item ()
@@ -290,7 +290,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_equal ()
@@ -298,7 +298,7 @@
 

 

 
-gchar *
+gchar *
 
 
 cd_sensor_to_string ()
@@ -336,7 +336,7 @@
 
Functions

 

 
cd_sensor_error_quark ()

-
GQuark
+
GQuark
 cd_sensor_error_quark (void);

 

 
Returns

@@ -360,7 +360,7 @@
 

 
cd_sensor_new_with_object_path ()

 
CdSensor *
-cd_sensor_new_with_object_path (const gchar *object_path);

+cd_sensor_new_with_object_path (const gchar *object_path);

 
Creates a new CdSensor object with a known object path.

 

 
Parameters

@@ -388,9 +388,9 @@
 
cd_sensor_connect ()

 
void
 cd_sensor_connect (CdSensor *sensor,
-                   GCancellable *cancellable,
-                   GAsyncReadyCallback callback,
-                   gpointer user_data);

+                   GCancellable *cancellable,
+                   GAsyncReadyCallback callback,
+                   gpointer user_data);
 
Connects to the sensor.

 

 
Parameters

@@ -408,7 +408,7 @@
 

 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
 
 

 

 
res
the GAsyncResult
the GAsyncResult

  
 

 

 
error
A GError or NULL
A GError or NULL

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-gboolean
+gboolean
 
 
 cd_sensor_connect_sync ()
@@ -49,7 +49,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_lock_sync ()
@@ -57,7 +57,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_unlock_sync ()
@@ -65,7 +65,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_sensor_set_options_sync ()
@@ -92,10 +92,10 @@
 
Functions

 

 
cd_sensor_connect_sync ()

-
gboolean
+
gboolean
 cd_sensor_connect_sync (CdSensor *sensor,
-                        GCancellable *cancellable,
-                        GError **error);

+                        GCancellable *cancellable,
+                        GError **error);

 
Connects to the object and fills up initial properties.

 
WARNING: This function is synchronous, and may block.
 Do not use it in GUI applications.

@@ -115,12 +115,12 @@
 

 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 
 

 
cancellable
a GCancellable or NULL
a GCancellable or NULL

  
 

 

 
error
a GError, or NULL.
a GError, or NULL.

  
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
const gchar *
+const gchar *
 
 
 cd_spectrum_get_id ()
@@ -105,7 +105,7 @@
 

 

 
-GArray *
+GArray *
 
 
 cd_spectrum_get_data ()
@@ -113,7 +113,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_start ()
@@ -121,7 +121,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_end ()
@@ -129,7 +129,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_norm ()
@@ -137,7 +137,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_resolution ()
@@ -145,7 +145,7 @@
 

 

 
-guint
+guint
 
 
 cd_spectrum_get_size ()
@@ -153,7 +153,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_value ()
@@ -161,7 +161,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_value_raw ()
@@ -169,7 +169,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_wavelength ()
@@ -177,7 +177,7 @@
 

 

 
-gdouble
+gdouble
 
 
 cd_spectrum_get_value_for_nm ()
@@ -277,7 +277,7 @@
 

 
cd_spectrum_sized_new ()

 
CdSpectrum *
-cd_spectrum_sized_new (guint reserved_size);

+cd_spectrum_sized_new (guint reserved_size);
 
Allocates a spectrum with a preallocated size.

 

 
Parameters

@@ -304,7 +304,7 @@
 

 
cd_spectrum_planckian_new ()

 
CdSpectrum *
-cd_spectrum_planckian_new (gdouble temperature);

+cd_spectrum_planckian_new (gdouble temperature);
 
Allocates a Planckian spectrum at a specific temperature.

 

 
Parameters

@@ -377,8 +377,8 @@
 
cd_spectrum_normalize ()

 
void
 cd_spectrum_normalize (CdSpectrum *spectrum,
-                       gdouble wavelength,
-                       gdouble value);

+                       gdouble wavelength,
+                       gdouble value);
 
Normalizes a spectrum to a specific value at a specific wavelength.

 

 
Parameters

@@ -414,7 +414,7 @@
 
cd_spectrum_normalize_max ()

 
void
 cd_spectrum_normalize_max (CdSpectrum *spectrum,
-                           gdouble value);

+                           gdouble value);
 
Normalizes a spectrum to a specific value at its maximum value.

 

 
Parameters

@@ -443,7 +443,7 @@
 

 

 
cd_spectrum_get_id ()

-
const gchar *
+
const gchar *
 cd_spectrum_get_id (const CdSpectrum *spectrum);

 
Gets the spectral data.

 

@@ -470,7 +470,7 @@
 

 

 
cd_spectrum_get_data ()

-
GArray *
+
GArray *
 cd_spectrum_get_data (const CdSpectrum *spectrum);

 
Gets the spectral data.
 NOTE: This is not normalized

@@ -499,7 +499,7 @@
 

 

 
cd_spectrum_get_start ()

-
gdouble
+
gdouble
 cd_spectrum_get_start (const CdSpectrum *spectrum);

 
Gets the start value of the spectral data.

 

@@ -526,7 +526,7 @@
 

 

 
cd_spectrum_get_end ()

-
gdouble
+
gdouble
 cd_spectrum_get_end (const CdSpectrum *spectrum);

 
Gets the end value of the spectral data.

 

@@ -553,7 +553,7 @@
 

 

 
cd_spectrum_get_norm ()

-
gdouble
+
gdouble
 cd_spectrum_get_norm (const CdSpectrum *spectrum);

 
Gets the normalization value of the spectral data.
 NOTE: This affects every value in the spectrum.

@@ -581,7 +581,7 @@
 

 

 
cd_spectrum_get_resolution ()

-
gdouble
+
gdouble
 cd_spectrum_get_resolution (const CdSpectrum *spectrum);

 
Gets the divisor of the spectra, for instance a .

 

@@ -608,7 +608,7 @@
 

 

 
cd_spectrum_get_size ()

-
guint
+
guint
 cd_spectrum_get_size (const CdSpectrum *spectrum);

 
Gets the size of the spectrum data.

 

@@ -635,9 +635,9 @@
 

 

 
cd_spectrum_get_value ()

-
gdouble
+
gdouble
 cd_spectrum_get_value (const CdSpectrum *spectrum,
-                       guint idx);

+                       guint idx);

 
Gets the spectrum data at a specified index.

 

 
Parameters

@@ -670,9 +670,9 @@
 

 

 
cd_spectrum_get_value_raw ()

-
gdouble
+
gdouble
 cd_spectrum_get_value_raw (const CdSpectrum *spectrum,
-                           guint idx);

+                           guint idx);

 
Gets the spectrum data at a specified index, without any normalization
 applied. Most people should use cd_spectrum_get_value() instead.

 

@@ -706,9 +706,9 @@
 

 

 
cd_spectrum_get_wavelength ()

-
gdouble
+
gdouble
 cd_spectrum_get_wavelength (const CdSpectrum *spectrum,
-                            guint idx);

+                            guint idx);

 
Gets the wavelenth that corresponds to the specified index.

 

 
Parameters

@@ -741,9 +741,9 @@
 

 

 
cd_spectrum_get_value_for_nm ()

-
gdouble
+
gdouble
 cd_spectrum_get_value_for_nm (const CdSpectrum *spectrum,
-                              gdouble wavelength);

+                              gdouble wavelength);

 
Gets the value from the spectral data for a given wavelength.

 

 
Parameters

@@ -778,7 +778,7 @@
 
cd_spectrum_set_id ()

 
void
 cd_spectrum_set_id (CdSpectrum *spectrum,
-                    const gchar *id);

+                    const gchar *id);

 
Sets a spectrum id.

 

 
Parameters

@@ -809,7 +809,7 @@
 
cd_spectrum_set_data ()

 
void
 cd_spectrum_set_data (CdSpectrum *spectrum,
-                      GArray *value);

+                      GArray *value);

 
Sets the spectrum data.

 

 
Parameters

@@ -840,7 +840,7 @@
 
cd_spectrum_set_start ()

 
void
 cd_spectrum_set_start (CdSpectrum *spectrum,
-                       gdouble start);

+                       gdouble start);

 
Set the start value of the spectal data in nm.

 

 
Parameters

@@ -871,7 +871,7 @@
 
cd_spectrum_set_end ()

 
void
 cd_spectrum_set_end (CdSpectrum *spectrum,
-                     gdouble end);

+                     gdouble end);

 
Set the end value of the spectal data in nm.

 
If there is already spectral data, the wavelength calibration will
 also be set automatically.

@@ -904,7 +904,7 @@
 
cd_spectrum_set_norm ()

 
void
 cd_spectrum_set_norm (CdSpectrum *spectrum,
-                      gdouble norm);

+                      gdouble norm);

 
Set the normalization value of the spectrum.
 NOTE: This affects every value in the spectrum.

 

@@ -936,8 +936,8 @@
 
cd_spectrum_set_value ()

 
void
 cd_spectrum_set_value (CdSpectrum *spectrum,
-                       guint idx,
-                       gdouble data);

+                       guint idx,
+                       gdouble data);

 
Overwrites the spectrum data at a specified index.

 

 
Parameters

@@ -973,7 +973,7 @@
 
cd_spectrum_add_value ()

 
void
 cd_spectrum_add_value (CdSpectrum *spectrum,
-                       gdouble data);

+                       gdouble data);

 
Adds a value in nm to the spectrum.

 

 
Parameters

@@ -998,7 +998,7 @@
 
CdSpectrum *
 cd_spectrum_multiply (CdSpectrum *s1,
                       CdSpectrum *s2,
-                      gdouble resolution);

+                      gdouble resolution);
 
Multiplies two spectra together.

 

 
Parameters

@@ -1039,6 +1039,6 @@
 

 

 

-
Generated by GTK-Doc V1.24.1

+
Generated by GTK-Doc V1.25

 
 
\ No newline at end of file
diff -Nru colord-1.3.2/doc/api/html/colord-cd-transform.html colord-1.3.3/doc/api/html/colord-cd-transform.html
--- colord-1.3.2/doc/api/html/colord-cd-transform.html	2016-03-21 11:48:32.000000000 +0000
+++ colord-1.3.3/doc/api/html/colord-cd-transform.html	2016-07-27 13:05:09.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 

 

 
-GQuark
+GQuark
 
 
 cd_transform_error_quark ()
@@ -161,7 +161,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_transform_get_bpc ()
@@ -177,7 +177,7 @@
 

 

 
-guint
+guint
 
 
 cd_transform_get_max_threads ()
@@ -185,7 +185,7 @@
 

 

 
-gboolean
+gboolean
 
 
 cd_transform_process ()
@@ -228,7 +228,7 @@
 
Functions

 

 
cd_transform_error_quark ()

-
GQuark
+
GQuark
 cd_transform_error_quark (void);

 

 
Returns

@@ -271,7 +271,7 @@
 

 

 
icc
a CdIcc instance or NULL.
a CdIcc instance or NULL.

  
 

 
 

 
icc
a CdIcc instance or NULL.
a CdIcc instance or NULL.

  
 

 
 

 
icc
a CdIcc instance or NULL.
a CdIcc instance or NULL.

  
 

 
 
 
 

 
cancellable
A GError, or NULL
A GError, or NULL

  
 

 

 
error
A GCancellable, or NULL
A GCancellable, or NULL